GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

only load user once, reload settings in admin panel

Browse Source
This commit is contained in:
Evan Prodromou 2009-11-07 23:16:34 -05:00
parent 144f817109
commit dd9fa0e683
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/adminpanelaction.php
View File

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