only load user once, reload settings in admin panel

diff --git a/lib/adminpanelaction.php b/lib/adminpanelaction.php
index 2e9261711b8464e386f06a2a6f64e8091706349e..fa3272f8aad9656159e422e03a2bad95239b4ff3 100644 (file)
--- a/lib/adminpanelaction.php
+++ b/lib/adminpanelaction.php
@@ -75,6 +75,10 @@ class AdminPanelAction extends Action
 
         $user = common_current_user();
 
+        // ...because they're logged in
+
+        assert(!empty($user));
+
         // It must be a "real" login, not saved cookie login
 
         if (!common_is_real_login()) {
@@ -88,8 +92,6 @@ class AdminPanelAction extends Action
 
         // User must have the right to change admin settings
 
-        $user = common_current_user();
-
         if (!$user->hasRight(Right::CONFIGURESITE)) {
             $this->clientError(_('You cannot make changes to this site.'));
             return;
@@ -116,6 +118,10 @@ class AdminPanelAction extends Action
             try {
                 $this->saveSettings();
 
+                // Reload settings
+
+                Config::loadSettings();
+
                 $this->success = true;
                 $this->msg     = _('Settings saved.');
             } catch (Exception $e) {