diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-10-06 15:00:40 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-10-06 15:00:40 +0200 |
| commit | 3f57609b75e93df8778f04ffc7b3ba2bddc713a9 (patch) | |
| tree | aa5d43655c31f41dda7907972e08431d3dedd99f /Zotlabs | |
| parent | 9850d1842087d1842d9360ed5fd3bdea74e575c9 (diff) | |
| parent | 778086ce199c38be793ed59e03eb0446af9263ec (diff) | |
| download | volse-hubzilla-3f57609b75e93df8778f04ffc7b3ba2bddc713a9.tar.gz volse-hubzilla-3f57609b75e93df8778f04ffc7b3ba2bddc713a9.tar.bz2 volse-hubzilla-3f57609b75e93df8778f04ffc7b3ba2bddc713a9.zip | |
merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs')
| -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); } } |