diff options
| author | Andrew Manning <tamanning@zoho.com> | 2018-06-08 05:22:01 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2018-06-08 05:22:01 -0400 |
| commit | df2d18160212ec546ec640dd1d2152fecada5557 (patch) | |
| tree | 126504df4e5ab2d42defbee153a748fe40253b38 /Zotlabs/Module/Acl.php | |
| parent | ed17e8a6499e48b032393be351c39f31a0edcbf3 (diff) | |
| parent | 7bf1c5f27b8b8f0eea226e81a5db99585c5a56b3 (diff) | |
| download | volse-hubzilla-df2d18160212ec546ec640dd1d2152fecada5557.tar.gz volse-hubzilla-df2d18160212ec546ec640dd1d2152fecada5557.tar.bz2 volse-hubzilla-df2d18160212ec546ec640dd1d2152fecada5557.zip | |
Merge branch 'dev' of framagit.org:hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Module/Acl.php')
| -rw-r--r-- | Zotlabs/Module/Acl.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index 2678aeb7a..7b52e88b5 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -94,8 +94,7 @@ class Acl extends \Zotlabs\Web\Controller { . " then POSITION('" . protect_sprintf(dbesc($search)) . "' 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(($col === 'xchan_addr') ? punify($search) : $search) . "%'" ) . " "; + $sql_extra3 = "AND ( xchan_addr like " . protect_sprintf( "'%" . dbesc(punify($search)) . "%'" ) . " OR xchan_name like " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " ) "; } else { |