From a2b2aea891ee04f41301ffbaabab534b741ec6d4 Mon Sep 17 00:00:00 2001
From: Moritz Bunkus <m.bunkus@linet-services.de>
Date: Mon, 23 Jun 2014 17:12:22 +0200
Subject: [PATCH] Instance-Conf am Anfang jedes Requests laden

---
 SL/Dispatcher.pm                  | 2 --
 SL/Dispatcher/AuthHandler/User.pm | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/SL/Dispatcher.pm b/SL/Dispatcher.pm
index 56791edd0..7ce18a476 100644
--- a/SL/Dispatcher.pm
+++ b/SL/Dispatcher.pm
@@ -105,8 +105,6 @@ sub pre_request_initialization {
       die "cannot find locale for user " . $params{login} unless $::locale   = Locale->new($::myconfig{countrycode});
 
       $::form->{login} = $params{login}; # normaly implicit at login
-
-      $::instance_conf->init;
     }
   }
 
diff --git a/SL/Dispatcher/AuthHandler/User.pm b/SL/Dispatcher/AuthHandler/User.pm
index 7b2a5eb66..7a8fd1d75 100644
--- a/SL/Dispatcher/AuthHandler/User.pm
+++ b/SL/Dispatcher/AuthHandler/User.pm
@@ -29,6 +29,7 @@ sub handle {
 
   $::auth->create_or_refresh_session;
   $::auth->delete_session_value('FLASH');
+  $::instance_conf->reload->data;
 
   return 1;
 }
-- 
2.20.1