harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

start removing db backticks

Browse Source
This commit is contained in:
redmatrix
2016-10-03 19:47:36 -07:00
parent fe7b7773ba
commit bad5057a74
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Zotlabs/Module/Acl.php
View File

@@ -77,7 +77,7 @@ class Acl extends \Zotlabs\Web\Controller {
if($search) {
$sql_extra = " AND `name` LIKE " . protect_sprintf( "'%" . dbesc($search) . "%'" ) . " ";
$sql_extra = " AND groups.gname 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.
@@ -105,9 +105,9 @@ class Acl extends \Zotlabs\Web\Controller {
if($type == '' || $type == 'g') {
$r = q("SELECT groups.id, groups.hash, groups.gname
FROM groups,group_member
FROM groups, group_member
WHERE groups.deleted = 0 AND groups.uid = %d
AND group_member.gid=groups.id
AND group_member.gid = groups.id
$sql_extra
GROUP BY groups.id
ORDER BY groups.gname