aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-10-01 12:38:04 +0200
committerMario Vavti <mario@mariovavti.com>2018-10-01 12:38:04 +0200
commit08a287dea10321a60473c8fd684a320ef94bdd37 (patch)
treef6a3a343cae3b1ad88c9311299b1f5ba983521c9
parent7dadf387e58ade457698dc2ffc58bbda7be46652 (diff)
downloadvolse-hubzilla-08a287dea10321a60473c8fd684a320ef94bdd37.tar.gz
volse-hubzilla-08a287dea10321a60473c8fd684a320ef94bdd37.tar.bz2
volse-hubzilla-08a287dea10321a60473c8fd684a320ef94bdd37.zip
do not default to channel_startpage if startpage app is not installed
-rw-r--r--Zotlabs/Module/Home.php6
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)