aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-04 14:54:37 -0800
committerfriendica <info@friendica.com>2015-01-04 14:54:37 -0800
commitaa18a43effabc389e789626b511fa83c0d8dbf34 (patch)
tree879b8ee20040c134ff22f03221e9aeb9fa889743
parent47526cdecf234bd097072737e5af2a3835d7cc9c (diff)
parent3983348b96c1b41154e413998760de98606a4b72 (diff)
downloadvolse-hubzilla-aa18a43effabc389e789626b511fa83c0d8dbf34.tar.gz
volse-hubzilla-aa18a43effabc389e789626b511fa83c0d8dbf34.tar.bz2
volse-hubzilla-aa18a43effabc389e789626b511fa83c0d8dbf34.zip
Merge branch 'master' into trinidad
-rw-r--r--mod/acl.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/acl.php b/mod/acl.php
index c18b56d8b..e6733351b 100644
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -30,7 +30,7 @@ function acl_init(&$a){
if ($search != "") {
$sql_extra = " AND `name` LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " ";
- $sql_extra2 = "AND ( xchan_name LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " OR xchan_addr LIKE " . protect_sprintf( "'%" . dbesc($search) . "%@%'" ) . ") ";
+ $sql_extra2 = "AND ( xchan_name LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " OR xchan_addr LIKE " . protect_sprintf( "'%" . dbesc($search) . ((strpos($search,'@') === false) ? "%@%'" : "%'")) . ") ";
// This horrible mess is needed because position also returns 0 if nothing is found. W/ould be MUCH easier if it instead returned a very large value
// Otherwise we could just order by LEAST(POSTION($search IN xchan_name),POSITION($search IN xchan_addr)).