X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FApp.php;h=26c93b250029d9509168fbad703607775b92d083;hb=2a0e18c7dd95a3c07640c173ea400803cf6738f4;hp=57d61d04bb32eca58dacf912a886b54ea1870645;hpb=94eca7704130822bf83bb5fee6930dee6bae81dd;p=friendica.git diff --git a/src/App.php b/src/App.php index 57d61d04bb..26c93b2500 100644 --- a/src/App.php +++ b/src/App.php @@ -101,6 +101,11 @@ class App */ private $isAjax; + /** + * @var MobileDetect + */ + public $mobileDetect; + /** * Register a stylesheet file path to be included in the tag of every page. * Inclusion is done in App->initHead(). @@ -268,6 +273,9 @@ class App // Detect mobile devices $mobile_detect = new MobileDetect(); + + $this->mobileDetect = $mobile_detect; + $this->is_mobile = $mobile_detect->isMobile(); $this->is_tablet = $mobile_detect->isTablet(); @@ -1360,14 +1368,18 @@ class App return ''; } - //// @TODO Compute the current theme only once (this behavior has - /// already been implemented, but it didn't work well - - /// https://github.com/friendica/friendica/issues/5092) - $this->computeCurrentTheme(); + if (!$this->currentTheme) { + $this->computeCurrentTheme(); + } return $this->currentTheme; } + public function setCurrentTheme($theme) + { + $this->currentTheme = $theme; + } + /** * Computes the current theme name based on the node settings, the user settings and the device type * @@ -1706,17 +1718,14 @@ class App } } - // Load current theme info + $content = ''; + + // Load current theme info after module has been executed as theme could have been set in module $theme_info_file = 'view/theme/' . $this->getCurrentTheme() . '/theme.php'; if (file_exists($theme_info_file)) { require_once $theme_info_file; } - // initialise content region - if ($this->getMode()->isNormal()) { - Core\Addon::callHooks('page_content_top', $this->page['content']); - } - // Call module functions if ($this->module_loaded) { $this->page['page_title'] = $this->module; @@ -1748,20 +1757,22 @@ class App } if (! $this->error) { - $arr = ['content' => $this->page['content']]; + $arr = ['content' => $content]; Core\Addon::callHooks($this->module . '_mod_content', $arr); - $this->page['content'] = $arr['content']; + $content = $arr['content']; $arr = ['content' => call_user_func([$this->module_class, 'content'])]; Core\Addon::callHooks($this->module . '_mod_aftercontent', $arr); - $this->page['content'] .= $arr['content']; + $content .= $arr['content']; } + } - if (function_exists(str_replace('-', '_', $this->getCurrentTheme()) . '_content_loaded')) { - $func = str_replace('-', '_', $this->getCurrentTheme()) . '_content_loaded'; - $func($this); - } + // initialise content region + if ($this->getMode()->isNormal()) { + Core\Addon::callHooks('page_content_top', $this->page['content']); } + $this->page['content'] .= $content; + /* Create the page head after setting the language * and getting any auth credentials. *