diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-20 19:03:18 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-20 19:03:18 -0700 |
| commit | 6a56a509d3df833c82b876cf89f0bbab2a26c641 (patch) | |
| tree | f78ed120a535606929d3f701f917fc048a70a8c2 /Zotlabs/Module/Login.php | |
| parent | df0cd4dbc7fbd4d31a953144e0af75ab27447969 (diff) | |
| parent | 779885f9afe99980c32d2bf30757cc655e5d9427 (diff) | |
| download | volse-hubzilla-6a56a509d3df833c82b876cf89f0bbab2a26c641.tar.gz volse-hubzilla-6a56a509d3df833c82b876cf89f0bbab2a26c641.tar.bz2 volse-hubzilla-6a56a509d3df833c82b876cf89f0bbab2a26c641.zip | |
Merge branch 'dev' into perms
Diffstat (limited to 'Zotlabs/Module/Login.php')
| -rw-r--r-- | Zotlabs/Module/Login.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Zotlabs/Module/Login.php b/Zotlabs/Module/Login.php index ff75e5268..ae35b922f 100644 --- a/Zotlabs/Module/Login.php +++ b/Zotlabs/Module/Login.php @@ -7,6 +7,9 @@ class Login extends \Zotlabs\Web\Controller { function get() { if(local_channel()) goaway(z_root()); + if(remote_channel() && $_SESSION['atoken']) + goaway(z_root()); + return login((\App::$config['system']['register_policy'] == REGISTER_CLOSED) ? false : true); } |