Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 05:35:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use provided account_id instead of user's logged in account_id. Necessary for bulk importer.

Browse source
This commit is contained in:
ken restivo 2015-11-18 00:03:59 -08:00
parent 68da4d90dc
commit 1f2a408be0
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mod/import.php
View file

@ -128,7 +128,7 @@ function import_account(&$a, $account_id) {
} }
else { else {
$r = q("select * from channel where channel_account_id = %d and channel_guid = '%s' limit 1", $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']) dbesc($channel['channel_guid'])
); );
if($r) if($r)
@ -166,7 +166,7 @@ function import_account(&$a, $account_id) {
if($data['photo']) { if($data['photo']) {
require_once('include/photo/photo_driver.php'); 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'])) if(is_array($data['profile']))
@ -335,7 +335,7 @@ function import_account(&$a, $account_id) {
unset($abook['abook_id']); unset($abook['abook_id']);
unset($abook['abook_rating']); unset($abook['abook_rating']);
unset($abook['abook_rating_text']); unset($abook['abook_rating_text']);
$abook['abook_account'] = get_account_id(); $abook['abook_account'] = $account_id;
$abook['abook_channel'] = $channel['channel_id']; $abook['abook_channel'] = $channel['channel_id'];
if(! array_key_exists('abook_blocked',$abook)) { if(! array_key_exists('abook_blocked',$abook)) {
$abook['abook_blocked'] = (($abook['abook_flags'] & 0x0001 ) ? 1 : 0); $abook['abook_blocked'] = (($abook['abook_flags'] & 0x0001 ) ? 1 : 0);