strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

some fixings

Browse source
This commit is contained in:
Philipp Holzer 2019-08-15 20:58:57 +02:00
parent 9f68e6b589
commit 30b69f1fc4
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/App.php
View file

@ -889,6 +889,9 @@ class App
$this->internalRedirect('search'); $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 // 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) // @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); $module = $module->determineClass($this->args, $router, $this->config);

5
src/App/Page.php
View file

@ -356,9 +356,6 @@ class Page implements ArrayAccess
{ {
$moduleName = $module->getName(); $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. /* Create the page content.
* Calls all hooks which are including content operations * Calls all hooks which are including content operations
* *
@ -455,7 +452,7 @@ class Page implements ArrayAccess
} }
// Theme templates expect $a as an App instance // Theme templates expect $a as an App instance
$a = $this; $a = $app;
// Used as is in view/php/default.php // Used as is in view/php/default.php
$lang = $l10n->getCurrentLang(); $lang = $l10n->getCurrentLang();