diff options
| author | zotlabs <mike@macgirvin.com> | 2018-10-04 19:20:10 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-10-04 19:20:10 -0700 |
| commit | 3a0a611f15f2789099acf57c6ca93828f5edae46 (patch) | |
| tree | d928cd86bc856ae80a95a9738fc8a96b8fa23e5b /Zotlabs/Module/Home.php | |
| parent | d33c331abd3ae500fc7cdac206ea647c4c71905e (diff) | |
| parent | 1eaf6df842184743ee20ec69931be1ff7136f34e (diff) | |
| download | volse-hubzilla-3a0a611f15f2789099acf57c6ca93828f5edae46.tar.gz volse-hubzilla-3a0a611f15f2789099acf57c6ca93828f5edae46.tar.bz2 volse-hubzilla-3a0a611f15f2789099acf57c6ca93828f5edae46.zip | |
Merge branch 'dev'
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) |