aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Connections.php
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2018-09-28 09:41:21 +0200
committerMario <mario@mariovavti.com>2018-09-28 09:41:21 +0200
commit9e87219aead74791cdb68d4fa166326a0bd92d78 (patch)
tree3cec224f7ebca28d3155ff335bf43fc39ea3db39 /Zotlabs/Module/Connections.php
parent1b7e220de734f30cf22452e36fe6b746676ddf46 (diff)
parent65785ead697056130d01520a917bfc2626788c0c (diff)
downloadvolse-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/Connections.php')
-rw-r--r--Zotlabs/Module/Connections.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Connections.php b/Zotlabs/Module/Connections.php
index 0e5f1dfe2..967e9521d 100644
--- a/Zotlabs/Module/Connections.php
+++ b/Zotlabs/Module/Connections.php
@@ -220,7 +220,7 @@ class Connections extends \Zotlabs\Web\Controller {
$sql_extra .= (($searching) ? protect_sprintf(" AND xchan_name like '%$search_txt%' ") : "");
if($_REQUEST['gid']) {
- $sql_extra .= " and xchan_hash in ( select xchan from group_member where gid = " . intval($_REQUEST['gid']) . " and uid = " . intval(local_channel()) . " ) ";
+ $sql_extra .= " and xchan_hash in ( select xchan from pgrp_member where gid = " . intval($_REQUEST['gid']) . " and uid = " . intval(local_channel()) . " ) ";
}
$r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash