aboutsummaryrefslogtreecommitdiffstats
path: root/view/js/autocomplete.js
diff options
context:
space:
mode:
authorRedSwede <redswede@riseup.net>2015-01-19 00:45:32 +0100
committerRedSwede <redswede@riseup.net>2015-01-19 00:45:32 +0100
commit08038eafb4e1e1374356727fa1f21dab244185cb (patch)
tree291d9fce556898b60c04faa24d35a2cfbb122787 /view/js/autocomplete.js
parentcfd983b7509d55a79621b2895205f1acd74dc564 (diff)
parent5d30565c665341e6a6a805684cee4d45c1d2fafe (diff)
downloadvolse-hubzilla-08038eafb4e1e1374356727fa1f21dab244185cb.tar.gz
volse-hubzilla-08038eafb4e1e1374356727fa1f21dab244185cb.tar.bz2
volse-hubzilla-08038eafb4e1e1374356727fa1f21dab244185cb.zip
Merge branch 'master' of git://github.com/friendica/red into dev_redswede
Diffstat (limited to 'view/js/autocomplete.js')
-rw-r--r--view/js/autocomplete.js1
1 files changed, 1 insertions, 0 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 40a9cd4c8..3c35df860 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -54,6 +54,7 @@ function contact_format(item) {
// Show contact information if not explicitly told to show something else
if(typeof item.text === 'undefined') {
var desc = ((item.label) ? item.nick + ' ' + item.label : item.nick)
+ if(typeof desc === 'undefined') desc = '';
if(desc) desc = ' ('+desc+')';
return "<div class='{0}' title='{4}'><img src='{1}'>{2}{3}</div>".format(item.taggable, item.photo, item.name, desc, item.link)
}