tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate headers on forward() inside a controller 

This avoids that the JS loader flattening arrays.

refs #9349
This commit is contained in:
Markus Frosch 2015-06-02 15:53:00 +02:00 committed by Eric Lippmann
parent 1e9ce1d0d5
commit ab8e775188
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -458,11 +458,11 @@ class ActionController extends Zend_Controller_Action
foreach ($notifications->getMessages() as $m) {
$notificationList[] = rawurlencode($m->type . ' ' . $m->message);
}
$resp->setHeader('X-Icinga-Notification', implode('&', $notificationList));
$resp->setHeader('X-Icinga-Notification', implode('&', $notificationList), true);
}
if ($this->reloadCss) {
$resp->setHeader('X-Icinga-CssReload', 'now');
$resp->setHeader('X-Icinga-CssReload', 'now', true);
}
if ($this->view->title) {
@ -472,18 +472,18 @@ class ActionController extends Zend_Controller_Action
}
$resp->setHeader(
'X-Icinga-Title',
rawurlencode($this->view->title . ' :: Icinga Web')
rawurlencode($this->view->title . ' :: Icinga Web', true)
);
} else {
$resp->setHeader('X-Icinga-Title', rawurlencode('Icinga Web'));
$resp->setHeader('X-Icinga-Title', rawurlencode('Icinga Web'), true);
}
if ($this->rerenderLayout) {
$this->getResponse()->setHeader('X-Icinga-Container', 'layout');
$this->getResponse()->setHeader('X-Icinga-Container', 'layout', true);
}
if ($this->autorefreshInterval !== null) {
$resp->setHeader('X-Icinga-Refresh', $this->autorefreshInterval);
$resp->setHeader('X-Icinga-Refresh', $this->autorefreshInterval, true);
}
}