[Pkg-owncloud-commits] [owncloud] 354/394: backport https://github.com/owncloud/core/pull/1751

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag v4.5.10
in repository owncloud.

commit cb174356e5f85eb20006b49fd8bb0e1295ebd45a
Author: Frank Karlitschek <frank at owncloud.org>
Date:   Mon Feb 18 14:29:56 2013 +0100

    backport
    https://github.com/owncloud/core/pull/1751
---
 apps/files_external/templates/settings.php |    2 +-
 settings/js/users.js                       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 82399b0..b8d7f55 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -17,7 +17,7 @@
 			<?php $_['mounts'] = array_merge($_['mounts'], array('' => array())); ?>
 			<?php foreach ($_['mounts'] as $mountPoint => $mount): ?>
 				<tr <?php echo ($mountPoint != '') ? 'class="'.$mount['class'].'"' : 'id="addMountPoint"'; ?>>
-					<td class="mountPoint"><input type="text" name="mountPoint" value="<?php echo $mountPoint; ?>" placeholder="<?php echo $l->t('Mount point'); ?>" /></td>
+					<td class="mountPoint"><input type="text" name="mountPoint" value="<?php echo p($mountPoint); ?>" placeholder="<?php echo $l->t('Mount point'); ?>" /></td>
 					<?php if ($mountPoint == ''): ?>
 						<td class="backend">
 							<select id="selectBackend" data-configurations='<?php echo json_encode($_['backends']); ?>'>
diff --git a/settings/js/users.js b/settings/js/users.js
index 473b8db..9f998ae 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -181,7 +181,7 @@ var UserList={
 			var addGroup = function(group) {
 				$('select[multiple]').each(function(index, element) {
 					if ($(element).find('option[value="'+group +'"]').length == 0) {
-						$(element).append('<option value="'+group+'">'+group+'</option>');
+						$(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
 					}
 				})
 			};

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git