From af64ca8fc8b4abe4c6654ba1bdaea9fc5fe12542 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@icinga.com>
Date: Wed, 15 Nov 2017 17:22:54 +0100
Subject: [PATCH] Fix that disabled stack straces via user prefs had no effect

Web::setupFrontController() took the user object into account when checking for disabled stacktraces.
But we changed our bootstrap order some time ago so we did not have a user in this method anymore.
Now, Web::setupUser() checks for disabled stacktaces in the user prefs instead.

refs #2595
---
 library/Icinga/Application/Web.php | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php
index db480abde..eae0873a1 100644
--- a/library/Icinga/Application/Web.php
+++ b/library/Icinga/Application/Web.php
@@ -423,6 +423,21 @@ class Web extends EmbeddedWeb
             $user = $auth->getUser();
             $this->getRequest()->setUser($user);
             $this->user = $user;
+
+            if ($user->can('application/stacktraces')) {
+                $displayExceptions = $this->user->getPreferences()->getValue(
+                    'icingaweb',
+                    'show_stacktraces'
+                );
+
+                if ($displayExceptions !== null) {
+                    $this->frontController->setParams(
+                        array(
+                            'displayExceptions' => $displayExceptions
+                        )
+                    );
+                }
+            }
         }
         return $this;
     }
@@ -462,13 +477,6 @@ class Web extends EmbeddedWeb
         $this->frontController->setControllerDirectory($this->getApplicationDir('/controllers'));
 
         $displayExceptions = $this->config->get('global', 'show_stacktraces', true);
-        if ($this->user !== null && $this->user->can('application/stacktraces')) {
-            $displayExceptions = $this->user->getPreferences()->getValue(
-                'icingaweb',
-                'show_stacktraces',
-                $displayExceptions
-            );
-        }
 
         $this->frontController->setParams(
             array(