From 9b15dbde1cf4d89468fdc153324276c12e9f7ff0 Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Tue, 14 Jul 2015 22:38:04 -0700
Subject: group fixes to import

---
 mod/import.php | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'mod/import.php')

diff --git a/mod/import.php b/mod/import.php
index dd16593c1..02f62e646 100644
--- a/mod/import.php
+++ b/mod/import.php
@@ -201,9 +201,19 @@ function import_post(&$a) {
 			ref_session_write(session_id(), serialize($_SESSION));
 		}
 	}
-	else
-		$channel = $a->get_channel();
-
+	else {
+		$r = q("select * from channel where channel_account_id = %d and channel_guid = '%s' limit 1",
+			intval(get_account_id()),
+			dbesc($channel['channel_guid'])
+		);
+		if($r)
+			$channel = $r[0];
+		else {
+			logger('mod_import: channel not found. ', print_r($channel,true));
+			notice( t('Cloned channel not found. Import failed.') . EOL);
+			return;
+		}
+	}
 
 	if($completed < 2) {
 
@@ -511,7 +521,7 @@ function import_post(&$a) {
 		}
 
 		$group_members = $data['group_member'];
-		if($groups_members) {
+		if($group_members) {
 			foreach($group_members as $group_member) {
 				unset($group_member['id']);
 				$group_member['uid'] = $channel['channel_id'];
-- 
cgit v1.2.3