diff options
| author | zotlabs <mike@macgirvin.com> | 2018-10-04 19:20:10 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-10-04 19:20:10 -0700 |
| commit | 3a0a611f15f2789099acf57c6ca93828f5edae46 (patch) | |
| tree | d928cd86bc856ae80a95a9738fc8a96b8fa23e5b /include/channel.php | |
| parent | d33c331abd3ae500fc7cdac206ea647c4c71905e (diff) | |
| parent | 1eaf6df842184743ee20ec69931be1ff7136f34e (diff) | |
| download | volse-hubzilla-3a0a611f15f2789099acf57c6ca93828f5edae46.tar.gz volse-hubzilla-3a0a611f15f2789099acf57c6ca93828f5edae46.tar.bz2 volse-hubzilla-3a0a611f15f2789099acf57c6ca93828f5edae46.zip | |
Merge branch 'dev'
Diffstat (limited to 'include/channel.php')
| -rw-r--r-- | include/channel.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/channel.php b/include/channel.php index 74c213fcd..6a934cb82 100644 --- a/include/channel.php +++ b/include/channel.php @@ -447,7 +447,7 @@ function create_identity($arr) { // if our role_permissions indicate that we're using a default collection ACL, add it. if(is_array($role_permissions) && $role_permissions['default_collection']) { - $r = q("select hash from groups where uid = %d and gname = '%s' limit 1", + $r = q("select hash from pgrp where uid = %d and gname = '%s' limit 1", intval($newuid), dbesc( t('Friends') ) ); @@ -837,14 +837,14 @@ function identity_basic_export($channel_id, $sections = null) { $ret['hubloc'] = $r; } - $r = q("select * from groups where uid = %d ", + $r = q("select * from pgrp where uid = %d ", intval($channel_id) ); if($r) $ret['group'] = $r; - $r = q("select * from group_member where uid = %d ", + $r = q("select * from pgrp_member where uid = %d ", intval($channel_id) ); if($r) @@ -2579,8 +2579,8 @@ function channel_remove($channel_id, $local = true, $unset_session = false) { q("DELETE FROM chatroom WHERE cr_uid = %d", intval($channel_id)); q("DELETE FROM conv WHERE uid = %d", intval($channel_id)); - q("DELETE FROM groups WHERE uid = %d", intval($channel_id)); - q("DELETE FROM group_member WHERE uid = %d", intval($channel_id)); + q("DELETE FROM pgrp WHERE uid = %d", intval($channel_id)); + q("DELETE FROM pgrp_member WHERE uid = %d", intval($channel_id)); q("DELETE FROM event WHERE uid = %d", intval($channel_id)); q("DELETE FROM mail WHERE channel_id = %d", intval($channel_id)); q("DELETE FROM menu WHERE menu_channel_id = %d", intval($channel_id)); |