diff options
| author | Mario <mario@mariovavti.com> | 2018-10-06 14:53:18 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2018-10-06 14:53:18 +0200 |
| commit | 3e231e7c13744ec4d2803941395fb00d8aa2d67f (patch) | |
| tree | 4e8a6413ff17218e34c873f9ff71ed2c7a69b2cf | |
| parent | a5e63aa90ac5a5160e55eea98beb0e867533314b (diff) | |
| parent | ebb4811a75d6c5a324b932a56df5e7cd6c068446 (diff) | |
| download | volse-hubzilla-3e231e7c13744ec4d2803941395fb00d8aa2d67f.tar.gz volse-hubzilla-3e231e7c13744ec4d2803941395fb00d8aa2d67f.tar.bz2 volse-hubzilla-3e231e7c13744ec4d2803941395fb00d8aa2d67f.zip | |
Merge branch 'patch-5' into 'dev'
Respect new table names on import
See merge request hubzilla/core!1314
| -rw-r--r-- | Zotlabs/Module/Import.php | 4 |
1 files changed, 2 insertions, 2 deletions
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); } } |