aboutsummaryrefslogtreecommitdiff
path: root/js/lib/ui.userpicker.js
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-12-22 08:12:07 -0500
committerCash Costello <cash.costello@gmail.com>2011-12-22 08:12:07 -0500
commite49df853b2cc3a6a9bc2dd527a64951050142eb9 (patch)
tree6f485b560f89331c65fad3993e055a1834b07177 /js/lib/ui.userpicker.js
parent5e5b3705a5ca7b66dfe386490c5570af88b49009 (diff)
parentfea599f1653d7206e34ac33c0c0a668cb587bc20 (diff)
downloadelgg-e49df853b2cc3a6a9bc2dd527a64951050142eb9.tar.gz
elgg-e49df853b2cc3a6a9bc2dd527a64951050142eb9.tar.bz2
Merge branch '1.8' after 1.8.2 release
Conflicts: version.php
Diffstat (limited to 'js/lib/ui.userpicker.js')
-rw-r--r--js/lib/ui.userpicker.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/lib/ui.userpicker.js b/js/lib/ui.userpicker.js
index 8287ba91c..7298da114 100644
--- a/js/lib/ui.userpicker.js
+++ b/js/lib/ui.userpicker.js
@@ -93,7 +93,7 @@ elgg.userpicker.viewUser = function(info) {
html += "<div class='elgg-image'>" + info.icon + "</div>";
html += "<div class='elgg-image-alt'>" + deleteLink + "</div>";
html += "<div class='elgg-body'>" + info.name + "</div>";
- html += "</div";
+ html += "</div>";
return html;
};