diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-11-24 14:19:22 +0100 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2014-11-24 14:19:22 +0100 |
| commit | bef8879cb1356b880279c6104fcffb0752414a7c (patch) | |
| tree | ce3733df7ca168f4afe7e963dc81b6f00944c34c /mod/group.php | |
| parent | 1cb45c30e9032794b7827738cc28f7728ac28677 (diff) | |
| parent | 5b7124f0daeca4aa619f6411ee373d9ff5a22b7b (diff) | |
| download | volse-hubzilla-bef8879cb1356b880279c6104fcffb0752414a7c.tar.gz volse-hubzilla-bef8879cb1356b880279c6104fcffb0752414a7c.tar.bz2 volse-hubzilla-bef8879cb1356b880279c6104fcffb0752414a7c.zip | |
Merge pull request #7 from friendica/master
Merge from main project
Diffstat (limited to 'mod/group.php')
| -rw-r--r-- | mod/group.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mod/group.php b/mod/group.php index 9b90b1a1a..f67623a83 100644 --- a/mod/group.php +++ b/mod/group.php @@ -44,7 +44,7 @@ function group_post(&$a) { $public = intval($_POST['public']); if((strlen($groupname)) && (($groupname != $group['name']) || ($public != $group['visible']))) { - $r = q("UPDATE `groups` SET `name` = '%s', visible = %d WHERE `uid` = %d AND `id` = %d LIMIT 1", + $r = q("UPDATE `groups` SET `name` = '%s', visible = %d WHERE `uid` = %d AND `id` = %d", dbesc($groupname), intval($public), intval(local_user()), @@ -117,7 +117,7 @@ function group_content(&$a) { check_form_security_token_ForbiddenOnErr('group_member_change', 't'); - $r = q("SELECT abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and not (xchan_flags & %d) and not (abook_flags & %d) and not (abook_flags & %d) limit 1", + $r = q("SELECT abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and not (xchan_flags & %d)>0 and not (abook_flags & %d)>0 and not (abook_flags & %d)>0 limit 1", dbesc(base64url_decode(argv(2))), intval(local_user()), intval(XCHAN_FLAGS_DELETED), @@ -211,7 +211,7 @@ function group_content(&$a) { group_rmv_member(local_user(),$group['name'],$member['xchan_hash']); } - $r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND not (abook_flags & %d) and not (xchan_flags & %d) and not (abook_flags & %d) order by xchan_name asc", + $r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND not (abook_flags & %d)>0 and not (xchan_flags & %d)>0 and not (abook_flags & %d)>0 order by xchan_name asc", intval(local_user()), intval(ABOOK_FLAG_BLOCKED), intval(XCHAN_FLAGS_DELETED), |