friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Move $page initialization into constructor

This commit is contained in:
Philipp Holzer 2019-08-15 17:04:36 +02:00
parent 55f9dba230
commit 4f0ee4df27
No known key found for this signature in database
GPG Key ID: D8365C3D36B77D90
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/App.php
View File

@ -43,8 +43,8 @@ use Psr\Log\LoggerInterface;
class App class App
{ {
/** @deprecated 2019.09 - use App\Arguments->getQueryString() */ /** @deprecated 2019.09 - use App\Arguments->getQueryString() */
public $query_string = ''; public $query_string;
public $page = []; public $page;
public $profile; public $profile;
public $profile_uid; public $profile_uid;
public $user; public $user;
@ -285,6 +285,19 @@ class App
$this->isAjax = strtolower(defaults($_SERVER, 'HTTP_X_REQUESTED_WITH', '')) == 'xmlhttprequest'; $this->isAjax = strtolower(defaults($_SERVER, 'HTTP_X_REQUESTED_WITH', '')) == 'xmlhttprequest';
$this->page = [
'aside' => '',
'bottom' => '',
'content' => '',
'footer' => '',
'htmlhead' => '',
'nav' => '',
'page_title' => '',
'right_aside' => '',
'template' => '',
'title' => ''
];
$this->load(); $this->load();
} }
@ -995,19 +1008,6 @@ class App
Core\Hook::loadHooks(); Core\Hook::loadHooks();
} }
$this->page = [
'aside' => '',
'bottom' => '',
'content' => '',
'footer' => '',
'htmlhead' => '',
'nav' => '',
'page_title' => '',
'right_aside' => '',
'template' => '',
'title' => ''
];
// Compatibility with the Android Diaspora client // Compatibility with the Android Diaspora client
if ($moduleName == 'stream') { if ($moduleName == 'stream') {
$this->internalRedirect('network?order=post'); $this->internalRedirect('network?order=post');