harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'patch-5' into 'dev'

Browse Source 
Respect new table names on import

See merge request hubzilla/core!1314

(cherry picked from commit 3e231e7c13)

ebb4811a Respect new table names on import
This commit is contained in:
Mario 2018-10-06 12:53:18 +00:00
parent dcd99c2d30
commit 63ba72331f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Module/Import.php
View File

@ -426,7 +426,7 @@ class Import extends \Zotlabs\Web\Controller {
unset($group['id']); unset($group['id']);
$group['uid'] = $channel['channel_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", $r = q("select * from pgrp where uid = %d",
intval($channel['channel_id']) intval($channel['channel_id'])
@ -448,7 +448,7 @@ class Import extends \Zotlabs\Web\Controller {
if($x['old'] == $group_member['gid']) if($x['old'] == $group_member['gid'])
$group_member['gid'] = $x['new']; $group_member['gid'] = $x['new'];
} }
create_table_from_array('group_member', $group_member); create_table_from_array('pgrp_member', $group_member);
} }
} }