diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-11-14 09:47:13 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-11-14 09:47:13 +0100 |
| commit | 5b4aa718781537e182cd8a17e99dd54000fa9d9d (patch) | |
| tree | c6ebd9d3bf2d4225dbfe3d35807195822a444a84 /include | |
| parent | c8dbcf8a2af7ac3b1a9e26c4c293574f919bd554 (diff) | |
| parent | aff476d0d457f6debe21dfa1e2a0c3ccdcf71443 (diff) | |
| download | volse-hubzilla-5b4aa718781537e182cd8a17e99dd54000fa9d9d.tar.gz volse-hubzilla-5b4aa718781537e182cd8a17e99dd54000fa9d9d.tar.bz2 volse-hubzilla-5b4aa718781537e182cd8a17e99dd54000fa9d9d.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include')
| -rw-r--r-- | include/group.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/group.php b/include/group.php index e0c20b536..03ebf7ee5 100644 --- a/include/group.php +++ b/include/group.php @@ -18,10 +18,6 @@ function group_add($uid,$name,$public = 0) { intval($r) ); if(($z) && $z[0]['deleted']) { - /*$r = q("UPDATE groups SET deleted = 0 WHERE uid = %d AND gname = '%s'", - intval($uid), - dbesc($name) - );*/ q('UPDATE groups SET deleted = 0 WHERE id = %d', intval($z[0]['id'])); notice( t('A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name.') . EOL); } @@ -81,11 +77,11 @@ function group_rmv($uid,$name) { $user_info['channel_default_group'] = ''; $change = true; } - if(strpos($user_info['channel_allow_gid'], '<' . $group_id . '>') !== false) { + if(strpos($user_info['channel_allow_gid'], '<' . $group_hash . '>') !== false) { $user_info['channel_allow_gid'] = str_replace('<' . $group_hash . '>', '', $user_info['channel_allow_gid']); $change = true; } - if(strpos($user_info['channel_deny_gid'], '<' . $group_id . '>') !== false) { + if(strpos($user_info['channel_deny_gid'], '<' . $group_hash . '>') !== false) { $user_info['channel_deny_gid'] = str_replace('<' . $group_hash . '>', '', $user_info['channel_deny_gid']); $change = true; } |