From 38ee467603ade2789028e256bd2df3dcca8edcae Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Wed, 15 Oct 2014 13:15:30 +0200 Subject: [PATCH] Fix that the session is written too early when post-dispatching --- library/Icinga/Web/Controller/ActionController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php index ff66a8381..a41670159 100644 --- a/library/Icinga/Web/Controller/ActionController.php +++ b/library/Icinga/Web/Controller/ActionController.php @@ -377,10 +377,9 @@ class ActionController extends Zend_Controller_Action } } - $this->shutdownSession(); - if ($req->getParam('format') === 'pdf') { $layout->setLayout('pdf'); + $this->shutdownSession(); $this->sendAsPdf(); exit; } @@ -388,6 +387,8 @@ class ActionController extends Zend_Controller_Action if ($this->isXhr()) { $this->postDispatchXhr(); } + + $this->shutdownSession(); } protected function postDispatchXhr()