Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-17 05:44:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove App->error

Browse source
This commit is contained in:
Hypolite Petovan 2019-05-01 21:17:03 -04:00
parent 9b91b0550d
commit 7b1ea6cad6
5 changed files with 1 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/App.php
View file

@ -49,7 +49,6 @@ class App
public $page_contact;
public $content;
public $data = [];
public $error = false;
public $cmd = '';
public $argv;
public $argc;
@ -1252,9 +1251,7 @@ class App
// "rawContent" is especially meant for technical endpoints.
// This endpoint doesn't need any theme initialization or other comparable stuff.
if (!$this->error) {
call_user_func([$this->module_class, 'rawContent']);
}
}
// Load current theme info after module has been initialized as theme could have been set in module
@ -1269,24 +1266,20 @@ class App
}
if ($this->module_class) {
if (! $this->error && $_SERVER['REQUEST_METHOD'] === 'POST') {
if ($_SERVER['REQUEST_METHOD'] === 'POST') {
Core\Hook::callAll($this->module . '_mod_post', $_POST);
call_user_func([$this->module_class, 'post']);
}
if (! $this->error) {
Core\Hook::callAll($this->module . '_mod_afterpost', $placeholder);
call_user_func([$this->module_class, 'afterpost']);
}
if (! $this->error) {
$arr = ['content' => $content];
Core\Hook::callAll($this->module . '_mod_content', $arr);
$content = $arr['content'];
$arr = ['content' => call_user_func([$this->module_class, 'content'])];
Core\Hook::callAll($this->module . '_mod_aftercontent', $arr);
$content .= $arr['content'];
}
}
// initialise content region