Merge pull request #7003 from MrPetovan/bug/7001-prevent-ajax-page_end
Only call page_end hooks for standalone pages (no Ajax)
This commit is contained in:
commit
c3f49b7151
|
@ -1302,8 +1302,9 @@ class App
|
||||||
header($_SERVER["SERVER_PROTOCOL"] . ' 403 ' . Core\L10n::t('Permission denied.'));
|
header($_SERVER["SERVER_PROTOCOL"] . ' 403 ' . Core\L10n::t('Permission denied.'));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Report anything which needs to be communicated in the notification area (before the main body)
|
if (!$this->isAjax()) {
|
||||||
Core\Hook::callAll('page_end', $this->page['content']);
|
Core\Hook::callAll('page_end', $this->page['content']);
|
||||||
|
}
|
||||||
|
|
||||||
// Add the navigation (menu) template
|
// Add the navigation (menu) template
|
||||||
if ($this->module != 'install' && $this->module != 'maintenance') {
|
if ($this->module != 'install' && $this->module != 'maintenance') {
|
||||||
|
|
Loading…
Reference in a new issue