aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Acl.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-03-31 09:26:58 +0200
committerMario Vavti <mario@mariovavti.com>2018-03-31 09:26:58 +0200
commit6433ce70a19be8c57edbc72f8df3a4c7ef52f389 (patch)
treecc0bc0abe91a2facd379097ade99439498da7b2d /Zotlabs/Module/Acl.php
parent6822415ee2efd4e2d3e5458c36cd5f582887969a (diff)
parent1c3e6697615b70d2528856b6c8e69962a14763dc (diff)
downloadvolse-hubzilla-6433ce70a19be8c57edbc72f8df3a4c7ef52f389.tar.gz
volse-hubzilla-6433ce70a19be8c57edbc72f8df3a4c7ef52f389.tar.bz2
volse-hubzilla-6433ce70a19be8c57edbc72f8df3a4c7ef52f389.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module/Acl.php')
-rw-r--r--Zotlabs/Module/Acl.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php
index 245b0a9b7..ef901aef1 100644
--- a/Zotlabs/Module/Acl.php
+++ b/Zotlabs/Module/Acl.php
@@ -95,7 +95,7 @@ class Acl extends \Zotlabs\Web\Controller {
. "' IN xchan_name) else position('" . protect_sprintf(dbesc(punify($search))) . "' IN xchan_addr) end, ";
$col = ((strpos($search,'@') !== false) ? 'xchan_addr' : 'xchan_name' );
- $sql_extra3 = "AND $col like " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " ";
+ $sql_extra3 = "AND $col like " . protect_sprintf( "'%" . dbesc(($col === 'xchan_addr') ? punify($search) : $search) . "%'" ) . " ";
}
else {