diff options
| author | Mario <mario@mariovavti.com> | 2018-09-28 09:41:21 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-09-28 09:41:21 +0200 |
| commit | 9e87219aead74791cdb68d4fa166326a0bd92d78 (patch) | |
| tree | 3cec224f7ebca28d3155ff335bf43fc39ea3db39 /include/channel.php | |
| parent | 1b7e220de734f30cf22452e36fe6b746676ddf46 (diff) | |
| parent | 65785ead697056130d01520a917bfc2626788c0c (diff) | |
| download | volse-hubzilla-9e87219aead74791cdb68d4fa166326a0bd92d78.tar.gz volse-hubzilla-9e87219aead74791cdb68d4fa166326a0bd92d78.tar.bz2 volse-hubzilla-9e87219aead74791cdb68d4fa166326a0bd92d78.zip | |
Merge branch 'patch-10' into 'dev'
rename groups and group_members tables for MySQL 8 compatibility
See merge request hubzilla/core!1290
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 7f49deb2e..33e438e53 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) @@ -2573,8 +2573,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)); |