tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-24 22:34:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ActionController: Don't override X-Icinga-Title when it's already set"

Browse Source 
This reverts commit 4cff1feb8fe2231df6568e9d1d711540984c80fe.

It's broken and obsolete since https://github.com/Icinga/ipl-web/pull/72.
This commit is contained in:
Johannes Meyer 2022-04-12 14:55:59 +02:00
parent e6eb1540c0
commit bc6b17b850
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Icinga/Web/Controller/ActionController.php
View File

@ -496,7 +496,6 @@ class ActionController extends Zend_Controller_Action
$resp->setReloadCss(true); $resp->setReloadCss(true);
} }
if ($resp->getHeader('X-Icinga-Title') === null) {
if ($this->view->title) { if ($this->view->title) {
if (preg_match('~[\r\n]~', $this->view->title)) { if (preg_match('~[\r\n]~', $this->view->title)) {
// TODO: Innocent exception and error log for hack attempts // TODO: Innocent exception and error log for hack attempts
@ -510,7 +509,6 @@ class ActionController extends Zend_Controller_Action
} else { } else {
$resp->setHeader('X-Icinga-Title', rawurlencode($this->view->defaultTitle), true); $resp->setHeader('X-Icinga-Title', rawurlencode($this->view->defaultTitle), true);
} }
}
$layout = $this->_helper->layout(); $layout = $this->_helper->layout();
if ($this->rerenderLayout) { if ($this->rerenderLayout) {