diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-10-19 11:18:28 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-10-19 11:18:28 +0200 |
| commit | fa9e9510e5d993d183feb942fe74be5fdd07f5cf (patch) | |
| tree | 41fec09f527a9346e043b8099b458a97d81b03ed /Zotlabs/Module/Home.php | |
| parent | 32de123db0ac526795a237ff46885fe8a332cbc0 (diff) | |
| parent | 06b3ad1071c755757555baf941e2c0f446f97b21 (diff) | |
| download | volse-hubzilla-fa9e9510e5d993d183feb942fe74be5fdd07f5cf.tar.gz volse-hubzilla-fa9e9510e5d993d183feb942fe74be5fdd07f5cf.tar.bz2 volse-hubzilla-fa9e9510e5d993d183feb942fe74be5fdd07f5cf.zip | |
Merge branch '3.8RC'3.8
Diffstat (limited to 'Zotlabs/Module/Home.php')
| -rw-r--r-- | Zotlabs/Module/Home.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Zotlabs/Module/Home.php b/Zotlabs/Module/Home.php index 647a6412a..7f2d6424d 100644 --- a/Zotlabs/Module/Home.php +++ b/Zotlabs/Module/Home.php @@ -13,14 +13,12 @@ class Home extends \Zotlabs\Web\Controller { $ret = array(); call_hooks('home_init',$ret); - + $splash = ((argc() > 1 && argv(1) === 'splash') ? true : false); $channel = \App::get_channel(); if(local_channel() && $channel && $channel['xchan_url'] && ! $splash) { - $dest = $channel['channel_startpage']; - if(! $dest) - $dest = get_pconfig(local_channel(),'system','startpage'); + $dest = (($ret['startpage']) ? $ret['startpage'] : ''); if(! $dest) $dest = get_config('system','startpage'); if(! $dest) |