From 94dfe87a6baba5424916a831877f91875a85278d Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 18 Jul 2013 21:35:28 -0700 Subject: fix default channel setting after import --- mod/import.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'mod') diff --git a/mod/import.php b/mod/import.php index 1bc61da43..4c878f5c6 100644 --- a/mod/import.php +++ b/mod/import.php @@ -9,7 +9,7 @@ require_once('include/identity.php'); function import_post(&$a) { - if(! $a->get_account()) { + if(! get_account_id()) { return; } @@ -119,11 +119,11 @@ function import_post(&$a) { // reset $channel = $r[0]; - set_default_login_identity($a->get_account(),$channel['channel_id'],false); + set_default_login_identity(get_account_id(),$channel['channel_id'],false); 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'],get_account_id(),$channel['channel_id']); } $profiles = $data['profile']; @@ -326,12 +326,17 @@ function import_post(&$a) { notice( t('Import completed.') . EOL); + change_channel($channel['channel_id']); + + goaway(z_root() . '/network' ); + + } function import_content(&$a) { - if(! $a->get_account()) { + if(! get_account_id()) { notice( t('You must be logged in to use this feature.')); return ''; } -- cgit v1.2.3