aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-11-18 02:45:39 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-11-18 02:45:39 -0800
commit179730e4851bfb26151502d4473231df86b9c8df (patch)
tree218bd19321dfe659663eb68725f09e211fc84627 /mod
parent106b3257e42b25e0e103a4d6e3cb1609a2004de6 (diff)
parent312cc415cec39f3b7a45f268acda5f0dd2500e3e (diff)
downloadvolse-hubzilla-179730e4851bfb26151502d4473231df86b9c8df.tar.gz
volse-hubzilla-179730e4851bfb26151502d4473231df86b9c8df.tar.bz2
volse-hubzilla-179730e4851bfb26151502d4473231df86b9c8df.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'mod')
-rw-r--r--mod/import.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/mod/import.php b/mod/import.php
index a33cf339b..02e71233a 100644
--- a/mod/import.php
+++ b/mod/import.php
@@ -123,12 +123,12 @@ 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 {
$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);