From bc6b17b850080f5a72fa8fead6074da38aa0ddd6 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Tue, 12 Apr 2022 14:55:59 +0200 Subject: [PATCH] Revert "ActionController: Don't override `X-Icinga-Title` when it's already set" This reverts commit 4cff1feb8fe2231df6568e9d1d711540984c80fe. It's broken and obsolete since https://github.com/Icinga/ipl-web/pull/72. --- .../Web/Controller/ActionController.php | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php index f9e3a12a7..608159971 100644 --- a/library/Icinga/Web/Controller/ActionController.php +++ b/library/Icinga/Web/Controller/ActionController.php @@ -496,20 +496,18 @@ class ActionController extends Zend_Controller_Action $resp->setReloadCss(true); } - if ($resp->getHeader('X-Icinga-Title') === null) { - if ($this->view->title) { - if (preg_match('~[\r\n]~', $this->view->title)) { - // TODO: Innocent exception and error log for hack attempts - throw new IcingaException('No way, guy'); - } - $resp->setHeader( - 'X-Icinga-Title', - rawurlencode($this->view->title . ' :: ' . $this->view->defaultTitle), - true - ); - } else { - $resp->setHeader('X-Icinga-Title', rawurlencode($this->view->defaultTitle), true); + if ($this->view->title) { + if (preg_match('~[\r\n]~', $this->view->title)) { + // TODO: Innocent exception and error log for hack attempts + throw new IcingaException('No way, guy'); } + $resp->setHeader( + 'X-Icinga-Title', + rawurlencode($this->view->title . ' :: ' . $this->view->defaultTitle), + true + ); + } else { + $resp->setHeader('X-Icinga-Title', rawurlencode($this->view->defaultTitle), true); } $layout = $this->_helper->layout();