From 63ba72331f26a86621bdc61e7864e928e4af4673 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 6 Oct 2018 12:53:18 +0000 Subject: Merge branch 'patch-5' into 'dev' Respect new table names on import See merge request hubzilla/core!1314 (cherry picked from commit 3e231e7c13744ec4d2803941395fb00d8aa2d67f) ebb4811a Respect new table names on import --- Zotlabs/Module/Import.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Zotlabs') diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index c5c52674a..6016328a5 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -426,7 +426,7 @@ class Import extends \Zotlabs\Web\Controller { unset($group['id']); $group['uid'] = $channel['channel_id']; - create_table_from_array('groups', $group); + create_table_from_array('pgrp', $group); } $r = q("select * from pgrp where uid = %d", intval($channel['channel_id']) @@ -448,7 +448,7 @@ class Import extends \Zotlabs\Web\Controller { if($x['old'] == $group_member['gid']) $group_member['gid'] = $x['new']; } - create_table_from_array('group_member', $group_member); + create_table_from_array('pgrp_member', $group_member); } } -- cgit v1.2.3