aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-11-13 14:40:46 -0800
committerzotlabs <mike@macgirvin.com>2017-11-13 14:40:46 -0800
commitd5ff82bbe46fd2b42a6474f645749fc1ef56ceb2 (patch)
tree16bf53b5fef04e0de20596ce59f09acf0524311b
parent7b6ddeb859288a87573b922dcce086de21189f8c (diff)
downloadvolse-hubzilla-d5ff82bbe46fd2b42a6474f645749fc1ef56ceb2.tar.gz
volse-hubzilla-d5ff82bbe46fd2b42a6474f645749fc1ef56ceb2.tar.bz2
volse-hubzilla-d5ff82bbe46fd2b42a6474f645749fc1ef56ceb2.zip
issue with group_rmv
-rw-r--r--include/group.php8
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;
}