summaryrefslogtreecommitdiffstats
path: root/settings/js/users.js
diff options
context:
space:
mode:
authorThomas Mueller <thomas.mueller@tmit.eu>2013-02-20 10:55:20 +0100
committerThomas Mueller <thomas.mueller@tmit.eu>2013-02-20 10:55:20 +0100
commit5062ae250b767867609f64c29ab4cde65f022b75 (patch)
treeba624bec5f2470fbaadb4b281c57386210e5708e /settings/js/users.js
parent2675290325dc6a67f6719febe5ed0a546bd7a32a (diff)
parent38782036798dbe0a34995a3fca0aa92583cb9099 (diff)
downloadnextcloud-server-5062ae250b767867609f64c29ab4cde65f022b75.tar.gz
nextcloud-server-5062ae250b767867609f64c29ab4cde65f022b75.zip
Merge branch 'master' into master-sqlserver
Conflicts: lib/files/cache/cache.php
Diffstat (limited to 'settings/js/users.js')
-rw-r--r--settings/js/users.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/js/users.js b/settings/js/users.js
index 086b0884a3b..63a62049839 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -182,7 +182,7 @@ var UserList = {
var addGroup = function (select, group) {
$('select[multiple]').each(function (index, element) {
if ($(element).find('option[value="' + group + '"]').length === 0 && select.data('msid') !== $(element).data('msid')) {
- $(element).append('<option value="' + group + '">' + group + '</option>');
+ $(element).append('<option value="' + escapeHTML(group) + '">' + escapeHTML(group) + '</option>');
}
})
};