diff options
| author | ken restivo <ken@restivo.org> | 2015-11-18 00:26:18 -0800 |
|---|---|---|
| committer | ken restivo <ken@restivo.org> | 2015-11-18 00:26:18 -0800 |
| commit | 312cc415cec39f3b7a45f268acda5f0dd2500e3e (patch) | |
| tree | 6c87bfc052b09ce2ff5dc2c55220866abeb2649e | |
| parent | 1f2a408be0310c7f70df2c916424dec1a2e25d6c (diff) | |
| download | volse-hubzilla-312cc415cec39f3b7a45f268acda5f0dd2500e3e.tar.gz volse-hubzilla-312cc415cec39f3b7a45f268acda5f0dd2500e3e.tar.bz2 volse-hubzilla-312cc415cec39f3b7a45f268acda5f0dd2500e3e.zip | |
Pass in account_id. Required for bulk identity importer.
| -rw-r--r-- | include/import.php | 8 | ||||
| -rw-r--r-- | mod/import.php | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/import.php b/include/import.php index 0fd1ab2a5..ffaea6c1a 100644 --- a/include/import.php +++ b/include/import.php @@ -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)); 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 { |