Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattpiwik <matthieu.aubry@gmail.com>2012-03-05 09:16:33 +0400
committermattpiwik <matthieu.aubry@gmail.com>2012-03-05 09:16:33 +0400
commitaa624c87c7054f9426d678db991d8ede2acc297e (patch)
tree659bddad54270fa87fdbcebd03c1ca54b592c386
parent421febf53bf9600247eba35566468e961308e3b8 (diff)
Refs #1713 Admin settings were not saved
git-svn-id: http://dev.piwik.org/svn/trunk@5961 59fd770c-687e-43c8-a1e3-f5a4ff64c105
-rw-r--r--plugins/PrivacyManager/Controller.php4
-rw-r--r--plugins/UsersManager/Controller.php5
2 files changed, 5 insertions, 4 deletions
diff --git a/plugins/PrivacyManager/Controller.php b/plugins/PrivacyManager/Controller.php
index 172eef809f..c45b208f58 100644
--- a/plugins/PrivacyManager/Controller.php
+++ b/plugins/PrivacyManager/Controller.php
@@ -31,7 +31,7 @@ class Piwik_PrivacyManager_Controller extends Piwik_Controller_Admin
$this->handlePluginState(Piwik_Common::getRequestVar("anonymizeIPEnable", 0));
$trackerConfig = Piwik_Config_Writer::getInstance()->Tracker;
$trackerConfig['ip_address_mask_length'] = Piwik_Common::getRequestVar("maskLength", 1);
- Piwik_Config::getInstance()->Tracker = $trackerConfig;
+ Piwik_Config_Writer::getInstance()->Tracker = $trackerConfig;
break;
case("formDeleteSettings"):
@@ -42,7 +42,7 @@ class Piwik_PrivacyManager_Controller extends Piwik_Controller_Admin
7 : Piwik_Common::getRequestVar("deleteOlderThan", 180);
$deleteLogs['delete_max_rows_per_run'] = Piwik_Common::getRequestVar("deleteMaxRows", 100);
- Piwik_Config::getInstance()->Deletelogs = $deleteLogs;
+ Piwik_Config_Writer::getInstance()->Deletelogs = $deleteLogs;
break;
default: //do nothing
diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php
index bd6ff42f2d..e7e5a7ca4a 100644
--- a/plugins/UsersManager/Controller.php
+++ b/plugins/UsersManager/Controller.php
@@ -277,7 +277,8 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin
$userLogin = Piwik::getCurrentUserLogin();
if(Piwik::isUserIsSuperUser())
{
- $superUser = Piwik_Config_Writer::getInstance()->superuser;
+ $config = Piwik_Config_Writer::getInstance();
+ $superUser = $config->superuser;
$updatedSuperUser = false;
if($newPassword !== false)
@@ -294,7 +295,7 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin
}
if($updatedSuperUser)
{
- Piwik_Config::getInstance()->superuser = $superUser;
+ $config->superuser = $superUser;
}
}
else