diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-17 21:40:04 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-17 21:40:04 -0700 |
| commit | de4f9d68bdaade902a8030888f9df035fa1329ec (patch) | |
| tree | 5021daad0c4002ce9b7c89233b7c8446552b5a07 /Zotlabs/Module/Home.php | |
| parent | 191cd21028ab108c2a7f982c654601d780865eff (diff) | |
| parent | 571b8cc85b3a770f16aed021bb39b889e0275ed6 (diff) | |
| download | volse-hubzilla-de4f9d68bdaade902a8030888f9df035fa1329ec.tar.gz volse-hubzilla-de4f9d68bdaade902a8030888f9df035fa1329ec.tar.bz2 volse-hubzilla-de4f9d68bdaade902a8030888f9df035fa1329ec.zip | |
Merge branch 'dev' into perms
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'); |