aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorken restivo <ken@restivo.org>2015-11-18 00:03:59 -0800
committerken restivo <ken@restivo.org>2015-11-18 00:03:59 -0800
commit1f2a408be0310c7f70df2c916424dec1a2e25d6c (patch)
treef191f09a4cfa6b170dd63ce6e373061b9c8c91a1 /mod
parent68da4d90dcbda1240ae014768a66a164fd5d2b36 (diff)
downloadvolse-hubzilla-1f2a408be0310c7f70df2c916424dec1a2e25d6c.tar.gz
volse-hubzilla-1f2a408be0310c7f70df2c916424dec1a2e25d6c.tar.bz2
volse-hubzilla-1f2a408be0310c7f70df2c916424dec1a2e25d6c.zip
Use provided account_id instead of user's logged in account_id. Necessary for bulk importer.
Diffstat (limited to 'mod')
-rw-r--r--mod/import.php6
1 files changed, 3 insertions, 3 deletions
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);