some fixings

diff --git a/src/App.php b/src/App.php
index e7381ab125419ea55ed2fcdab8418e0772a8affd..d70adf27fdafa8daa08a01df9fd354c72bd5b934 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -889,6 +889,9 @@ class App
                                $this->internalRedirect('search');
                        }
 
+                       // Initialize module that can set the current theme in the init() method, either directly or via App->profile_uid
+                       $this->page['page_title'] = $moduleName;
+
                        // determine the module class and save it to the module instance
                        // @todo there's an implicit dependency due SESSION::start(), so it has to be called here (yet)
                        $module = $module->determineClass($this->args, $router, $this->config);

diff --git a/src/App/Page.php b/src/App/Page.php
index 1fb927b4639945e2ee20074ade03231d50c44fe8..5298a66cbd0f2e097d765e5c6264a5c4d92d2781 100644 (file)
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -356,9 +356,6 @@ class Page implements ArrayAccess
        {
                $moduleName = $module->getName();
 
-               // Initialize module that can set the current theme in the init() method, either directly or via App->profile_uid
-               $this->page['page_title'] = $moduleName;
-
                /* Create the page content.
                 * Calls all hooks which are including content operations
                 *
@@ -455,7 +452,7 @@ class Page implements ArrayAccess
                }
 
                // Theme templates expect $a as an App instance
-               $a = $this;
+               $a = $app;
 
                // Used as is in view/php/default.php
                $lang = $l10n->getCurrentLang();