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

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,

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,