From 1f2a408be0310c7f70df2c916424dec1a2e25d6c Mon Sep 17 00:00:00 2001 From: ken restivo Date: Wed, 18 Nov 2015 00:03:59 -0800 Subject: Use provided account_id instead of user's logged in account_id. Necessary for bulk importer. --- mod/import.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mod') diff --git a/mod/import.php b/mod/import.php index a33cf339b..1b8bc3098 100644 --- a/mod/import.php +++ b/mod/import.php @@ -128,7 +128,7 @@ function import_account(&$a, $account_id) { } else { $r = q("select * from channel where channel_account_id = %d and channel_guid = '%s' limit 1", - intval(get_account_id()), + intval($account_id), dbesc($channel['channel_guid']) ); if($r) @@ -166,7 +166,7 @@ function import_account(&$a, $account_id) { if($data['photo']) { require_once('include/photo/photo_driver.php'); - import_channel_photo(base64url_decode($data['photo']['data']),$data['photo']['type'],get_account_id(),$channel['channel_id']); + import_channel_photo(base64url_decode($data['photo']['data']),$data['photo']['type'],$account_id,$channel['channel_id']); } if(is_array($data['profile'])) @@ -335,7 +335,7 @@ function import_account(&$a, $account_id) { unset($abook['abook_id']); unset($abook['abook_rating']); unset($abook['abook_rating_text']); - $abook['abook_account'] = get_account_id(); + $abook['abook_account'] = $account_id; $abook['abook_channel'] = $channel['channel_id']; if(! array_key_exists('abook_blocked',$abook)) { $abook['abook_blocked'] = (($abook['abook_flags'] & 0x0001 ) ? 1 : 0); -- cgit v1.2.3 From 312cc415cec39f3b7a45f268acda5f0dd2500e3e Mon Sep 17 00:00:00 2001 From: ken restivo Date: Wed, 18 Nov 2015 00:26:18 -0800 Subject: Pass in account_id. Required for bulk identity importer. --- mod/import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod') diff --git a/mod/import.php b/mod/import.php index 1b8bc3098..02e71233a 100644 --- a/mod/import.php +++ b/mod/import.php @@ -123,7 +123,7 @@ function import_account(&$a, $account_id) { if(array_key_exists('channel',$data)) { if($completed < 1) { - $channel = import_channel($data['channel']); + $channel = import_channel($data['channel'], $account_id); } else { -- cgit v1.2.3