aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-07-18 21:35:28 -0700
committerfriendica <info@friendica.com>2013-07-18 21:35:28 -0700
commit94dfe87a6baba5424916a831877f91875a85278d (patch)
treed2166cffc892d04ff1ecaef3b95b0af5fa33b356
parent247d132e17a86ae4fe5c10eda23cfd9d7c64dd9e (diff)
downloadvolse-hubzilla-94dfe87a6baba5424916a831877f91875a85278d.tar.gz
volse-hubzilla-94dfe87a6baba5424916a831877f91875a85278d.tar.bz2
volse-hubzilla-94dfe87a6baba5424916a831877f91875a85278d.zip
fix default channel setting after import
-rw-r--r--include/identity.php12
-rw-r--r--mod/import.php13
2 files changed, 16 insertions, 9 deletions
diff --git a/include/identity.php b/include/identity.php
index 4bbc8970b..7e42e33a8 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -241,11 +241,13 @@ function set_default_login_identity($account_id,$channel_id,$force = true) {
$r = q("select account_default_channel from account where account_id = %d limit 1",
intval($account_id)
);
- if(($r) && (count($r)) && ((! intval($r[0]['account_default_channel'])) || $force)) {
- $r = q("update account set account_default_channel = %d where account_id = %d limit 1",
- intval($channel_id),
- intval($account_id)
- );
+ if($r) {
+ if((intval($r[0]['account_default_channel']) == 0) || ($force)) {
+ $r = q("update account set account_default_channel = %d where account_id = %d limit 1",
+ intval($channel_id),
+ intval($account_id)
+ );
+ }
}
}
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 '';
}