aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Acl.php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2018-03-31 13:41:29 -0400
committerAndrew Manning <tamanning@zoho.com>2018-03-31 13:41:29 -0400
commit6decffb00c00fabcb4ef581084eaca038e340686 (patch)
tree34471f015e0b33007ad40059dfdd09c83a768fbb /Zotlabs/Module/Acl.php
parent1dc795722a8e748ebb98e8fab778cd4686a0654f (diff)
parent6433ce70a19be8c57edbc72f8df3a4c7ef52f389 (diff)
downloadvolse-hubzilla-6decffb00c00fabcb4ef581084eaca038e340686.tar.gz
volse-hubzilla-6decffb00c00fabcb4ef581084eaca038e340686.tar.bz2
volse-hubzilla-6decffb00c00fabcb4ef581084eaca038e340686.zip
Merge branch 'dev' into oauth2
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 {