From 35d4daa4f991dcfcfc0e353b4bc10664e8ba7e3d Mon Sep 17 00:00:00 2001 From: Philipp Holzer Date: Sat, 4 May 2019 16:26:32 +0200 Subject: [PATCH] Kept the hook, ditched the init --- src/Module/Home.php | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/src/Module/Home.php b/src/Module/Home.php index f58664f9d7..adcdb02a63 100644 --- a/src/Module/Home.php +++ b/src/Module/Home.php @@ -12,16 +12,24 @@ use Friendica\Core\Renderer; */ class Home extends BaseModule { - public static function init() + public static function content() { - // currently no returned data is used - $ret = []; + if (!empty($_SESSION['theme'])) { + unset($_SESSION['theme']); + } - Hook::callAll('home_init', $ret); + if (!empty($_SESSION['mobile-theme'])) { + unset($_SESSION['mobile-theme']); + } $app = self::getApp(); $config = $app->getConfig(); + // currently no returned data is used + $ret = []; + + Hook::callAll('home_init', $ret); + if (local_user() && ($app->user['nickname'])) { $app->internalRedirect('network'); } @@ -29,20 +37,6 @@ class Home extends BaseModule if (strlen($config->get('system', 'singleuser'))) { $app->internalRedirect('/profile/' . $config->get('system', 'singleuser')); } - } - - public static function content() - { - if (!empty($_SESSION['theme'])) { - unset($_SESSION['theme']); - } - - if (!empty($_SESSION['mobile-theme'])) { - unset($_SESSION['mobile-theme']); - } - - $app = self::getApp(); - $config = $app->getConfig(); $customHome = ''; $defaultHeader = ($config->get('config', 'sitename') ? L10n::t('Welcome to %s', $config->get('config', 'sitename')) : ''); -- 2.39.5