harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass in account_id. Required for bulk identity importer.

Browse Source
This commit is contained in:
ken restivo 2015-11-18 00:26:18 -08:00
parent 1f2a408be0
commit 312cc415ce
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/import.php
View File

@ -2,7 +2,7 @@
require_once('include/menu.php');
function import_channel($channel) {
function import_channel($channel, $account_id) {
if(! array_key_exists('channel_system',$channel)) {
$channel['channel_system'] = (($channel['channel_pageflags'] & 0x1000) ? 1 : 0);
@ -48,7 +48,7 @@ function import_channel($channel) {
}
unset($channel['channel_id']);
$channel['channel_account_id'] = get_account_id();
$channel['channel_account_id'] = $account_id;
$channel['channel_primary'] = (($seize) ? 1 : 0);
if($channel['channel_pageflags'] & PAGE_ALLOWCODE) {
@ -72,7 +72,7 @@ function import_channel($channel) {
}
$r = q("select * from channel where channel_account_id = %d and channel_guid = '%s' limit 1",
intval(get_account_id()),
intval($account_id),
$channel['channel_guid'] // Already dbesc'd
);
if(! $r) {
@ -83,7 +83,7 @@ function import_channel($channel) {
// reset
$channel = $r[0];
set_default_login_identity(get_account_id(),$channel['channel_id'],false);
set_default_login_identity($account_id,$channel['channel_id'],false);
logger('import step 1');
$_SESSION['import_step'] = 1;
ref_session_write(session_id(), serialize($_SESSION));

2
mod/import.php
View File

@ -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 {