diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-06-01 09:15:56 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-06-01 09:15:56 +0200 |
| commit | c1039977f1d64611d2c793f3aded96d031b74183 (patch) | |
| tree | fa32a8f59c863564998cd149a902388dd363d605 /Zotlabs/Module/Import.php | |
| parent | 316fee93f7f7df92db514de961b74a71556fdb63 (diff) | |
| parent | b1259876bf398880e7b0c1b44d90f94983243e72 (diff) | |
| download | volse-hubzilla-c1039977f1d64611d2c793f3aded96d031b74183.tar.gz volse-hubzilla-c1039977f1d64611d2c793f3aded96d031b74183.tar.bz2 volse-hubzilla-c1039977f1d64611d2c793f3aded96d031b74183.zip | |
Merge branch 'dev' into sabre32
Diffstat (limited to 'Zotlabs/Module/Import.php')
| -rw-r--r-- | Zotlabs/Module/Import.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index 57ced22a3..122e27e90 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -408,8 +408,12 @@ class Import extends \Zotlabs\Web\Controller { $saved = array(); foreach($groups as $group) { $saved[$group['hash']] = array('old' => $group['id']); + if(array_key_exists('name',$group)) { + $group['gname'] = $group['name']; + unset($group['name']); + } unset($group['id']); - $group['uid'] = $channel['channel_id']; + $group['uid'] = $channel['channel_id']; dbesc_array($group); $r = dbq("INSERT INTO groups (`" . implode("`, `", array_keys($group)) |