Merge https://github.com/friendica/red into pending_merge

24 files changed, 1 insertions, 5 deletions

diff --git a/app/admin.png b/app/admin.png
index f1954e52a..cde922e8e 100644
--- a/app/admin.png
+++ b/app/admin.png
diff --git a/app/bugreport.png b/app/bugreport.png
index 64b6b7e9f..4b59da185 100644
--- a/app/bugreport.png
+++ b/app/bugreport.png
diff --git a/app/chat.png b/app/chat.png
index aa03c75dd..9d3fdebd7 100644
--- a/app/chat.png
+++ b/app/chat.png
diff --git a/app/directory.png b/app/directory.png
index 2df872d94..659f69051 100644
--- a/app/directory.png
+++ b/app/directory.png
diff --git a/app/events.png b/app/events.png
index 411ee51f9..a5670fd1e 100644
--- a/app/events.png
+++ b/app/events.png
diff --git a/app/features.png b/app/features.png
index cdccd19f7..5faf14bc3 100644
--- a/app/features.png
+++ b/app/features.png
diff --git a/app/help.png b/app/help.png
index e1348231c..6b9b1ccb6 100644
--- a/app/help.png
+++ b/app/help.png
diff --git a/app/home.png b/app/home.png
index 3f1b864fc..4b45f2a7a 100644
--- a/app/home.png
+++ b/app/home.png
diff --git a/app/invite.png b/app/invite.png
index 1cd9ce254..dbc2cbbfa 100644
--- a/app/invite.png
+++ b/app/invite.png
diff --git a/app/lang.png b/app/lang.png
index 4c0b9aad1..debffd1ae 100644
--- a/app/lang.png
+++ b/app/lang.png
diff --git a/app/mail.png b/app/mail.png
index 74fbdb03e..bbd9f8449 100644
--- a/app/mail.png
+++ b/app/mail.png
diff --git a/app/manage.png b/app/manage.png
index 4c4d13162..38a4dcbae 100644
--- a/app/manage.png
+++ b/app/manage.png
diff --git a/app/mood.png b/app/mood.png
index 7df642b96..2a5c1aca6 100644
--- a/app/mood.png
+++ b/app/mood.png
diff --git a/app/photos.png b/app/photos.png
index b4b2c519e..59b038288 100644
--- a/app/photos.png
+++ b/app/photos.png
diff --git a/app/poke.png b/app/poke.png
index 1d264dd1b..9655d54ff 100644
--- a/app/poke.png
+++ b/app/poke.png
diff --git a/app/post.png b/app/post.png
index 11d48e271..4a4355581 100644
--- a/app/post.png
+++ b/app/post.png
diff --git a/app/probe.png b/app/probe.png
index 71a954bf8..21bd85cd9 100644
--- a/app/probe.png
+++ b/app/probe.png
diff --git a/app/search.png b/app/search.png
index e483280ec..505d93c3f 100644
--- a/app/search.png
+++ b/app/search.png
diff --git a/app/settings.png b/app/settings.png
index ff5d8e5d2..2ba11a79a 100644
--- a/app/settings.png
+++ b/app/settings.png
diff --git a/app/storage.png b/app/storage.png
index c1f2df801..ad8b89f6a 100644
--- a/app/storage.png
+++ b/app/storage.png
diff --git a/app/suggest.png b/app/suggest.png
index 6868da30f..ca9180528 100644
--- a/app/suggest.png
+++ b/app/suggest.png
diff --git a/app/webpages.png b/app/webpages.png
index 460117bae..72a091831 100644
--- a/app/webpages.png
+++ b/app/webpages.png
diff --git a/mod/photos.php b/mod/photos.php
index 7a9229cc4..f4e770ec0 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -697,13 +697,10 @@ function photos_content(&$a) {
 				$imagelink = ($a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/image/' . $rr['resource_id']
 				. (($_GET['order'] === 'posted') ? '?f=&order=posted' : ''));
 
-				$rel=("photo");
-
 				$photos[] = array(
 					'id' => $rr['id'],
 					'twist' => ' ' . $twist . rand(2,4),
 					'link' => $imagelink,
-					'rel' => $rel,
 					'title' => t('View Photo'),
 					'src' => $a->get_baseurl() . '/photo/' . $rr['resource_id'] . '-' . $rr['scale'] . '.' .$ext,
 					'alt' => $imgalt_e,
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index ba71bb2f5..7c3145769 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -7,7 +7,6 @@ function mysearch(term, callback, backend_url) {
 	var postdata = {
 		start:0,
 		count:100,
-		//search:term.substring(1),
 		search:term,
 		type:'c',
 	}
@@ -40,7 +39,7 @@ function replace(item) {
 
 	// Autocomplete contacts
 	contacts = {
-		match: /(^|\s)(@!?)(\w{2,})$/,
+		match: /(^|\s)(@\!*)([^ \n]+)$/,
 		index: 3,
 		search: function(term, callback) { mysearch(term, callback, backend_url); },
 		replace: replace,