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 /Zotlabs/Module/Settings | |
| 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 'Zotlabs/Module/Settings')
| -rw-r--r-- | Zotlabs/Module/Settings/Channel.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Settings/Channel.php b/Zotlabs/Module/Settings/Channel.php index 27a8e695d..73cb4decb 100644 --- a/Zotlabs/Module/Settings/Channel.php +++ b/Zotlabs/Module/Settings/Channel.php @@ -63,7 +63,7 @@ class Channel { } $hide_presence = 1 - (intval($role_permissions['online'])); if($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(local_channel()), dbesc( t('Friends') ) ); @@ -71,7 +71,7 @@ class Channel { require_once('include/group.php'); group_add(local_channel(), t('Friends')); group_add_member(local_channel(),t('Friends'),$channel['channel_hash']); - $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(local_channel()), dbesc( t('Friends') ) ); |