diff options
| author | friendica <info@friendica.com> | 2014-01-25 15:51:32 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-01-25 15:51:32 -0800 |
| commit | b5c6db12051a8e40afe0d8dabbd4775d21adcb4e (patch) | |
| tree | d2a677a19154ab2e92d187c3ba46a3c2b9fb89d5 | |
| parent | 339a0f69c194d098333ed4d81b86cbc12f1339f3 (diff) | |
| parent | 8b399b2fb8f2f063eaa159b2c9f26b9a3912f5da (diff) | |
| download | volse-hubzilla-b5c6db12051a8e40afe0d8dabbd4775d21adcb4e.tar.gz volse-hubzilla-b5c6db12051a8e40afe0d8dabbd4775d21adcb4e.tar.bz2 volse-hubzilla-b5c6db12051a8e40afe0d8dabbd4775d21adcb4e.zip | |
Merge https://github.com/friendica/red into zpull
| -rw-r--r-- | include/security.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/security.php b/include/security.php index b2c613108..4a15e52af 100644 --- a/include/security.php +++ b/include/security.php @@ -60,7 +60,8 @@ function change_channel($change_channel) { intval(get_account_id()), intval(PAGE_REMOVED) ); - if($r) { + + if($r) { $hash = $r[0]['channel_hash']; $_SESSION['uid'] = intval($r[0]['channel_id']); get_app()->set_channel($r[0]); @@ -74,7 +75,7 @@ function change_channel($change_channel) { ); if($x) { $_SESSION['my_url'] = $x[0]['xchan_url']; - $_SESSION['my_address'] = $x[0]['channel_address'] . '@' . substr(get_app()->get_baseurl(),strpos(get_app()->get_baseurl(),'://')+3); + $_SESSION['my_address'] = $r[0]['channel_address'] . '@' . substr(get_app()->get_baseurl(),strpos(get_app()->get_baseurl(),'://')+3); get_app()->set_observer($x[0]); get_app()->set_perms(get_all_perms(local_user(),$hash)); |