diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-07-16 21:04:04 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-07-16 21:04:04 -0400 |
| commit | 99354ac57622002c0bbd820235d03321406f8d39 (patch) | |
| tree | f8ad698a1c901f757dfc4354721846c8be82ab7e /Zotlabs/Module/Home.php | |
| parent | e7b853175154688d60d83ca5935650d1128973c6 (diff) | |
| parent | f396b1bf735a7dc9eb3632e49c1269de54777c6d (diff) | |
| download | volse-hubzilla-99354ac57622002c0bbd820235d03321406f8d39.tar.gz volse-hubzilla-99354ac57622002c0bbd820235d03321406f8d39.tar.bz2 volse-hubzilla-99354ac57622002c0bbd820235d03321406f8d39.zip | |
Merge remote-tracking branch 'upstream/dev' into website-import-remote
Diffstat (limited to 'Zotlabs/Module/Home.php')
| -rw-r--r-- | Zotlabs/Module/Home.php | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Zotlabs/Module/Home.php b/Zotlabs/Module/Home.php index f3ba96fdd..79449c3b2 100644 --- a/Zotlabs/Module/Home.php +++ b/Zotlabs/Module/Home.php @@ -28,6 +28,19 @@ class Home extends \Zotlabs\Web\Controller { goaway($dest); } + + if(remote_channel() && (! $splash) && $_SESSION['atoken']) { + $r = q("select * from atoken where atoken_id = %d", + intval($_SESSION['atoken']) + ); + if($r) { + $x = channelx_by_n($r[0]['atoken_uid']); + if($x) { + goaway(z_root() . '/channel/' . $x['channel_address']); + } + } + } + if(get_account_id() && ! $splash) { goaway(z_root() . '/new_channel'); |