refactor

2 files changed, 6 insertions, 10 deletions

diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php
index 7a0b992b64..60d13ea6c1 100644
--- a/plugins/UsersManager/API.php
+++ b/plugins/UsersManager/API.php
@@ -79,10 +79,10 @@ class Piwik_UsersManager_API
         Piwik::checkUserIsSuperUserOrTheUser($userLogin);
         
         $optionValue = Piwik_GetOption($this->getPreferenceId($userLogin, $preferenceName));
-        if ($optionValue === false) {
-            return $this->getDefaultUserPreference($userLogin, $preferenceName);
+        if ($optionValue !== false) {
+            return $optionValue;
         }
-        return $optionValue;
+        return $this->getDefaultUserPreference($preferenceName, $userLogin);
     }
 
     private function getPreferenceId($login, $preference)
@@ -90,14 +90,14 @@ class Piwik_UsersManager_API
         return $login . '_' . $preference;
     }
     
-    private function getDefaultUserPreference($login, $preferenceName)
+    private function getDefaultUserPreference($preferenceName, $login)
     {
         switch ($preferenceName) {
             case self::PREFERENCE_DEFAULT_REPORT:
                 $viewableSiteIds = Piwik_SitesManager_API::getInstance()->getSitesIdWithAtLeastViewAccess($login);
                 return reset($viewableSiteIds);
             case self::PREFERENCE_DEFAULT_REPORT_DATE:
-                return 'yesterday';
+                return Piwik_Config::getInstance()->General['default_day'];
             default:
                 return false;
         }
diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php
index 77d7f5f8ce..9a19456a88 100644
--- a/plugins/UsersManager/Controller.php
+++ b/plugins/UsersManager/Controller.php
@@ -110,11 +110,7 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin
      */
     protected function getDefaultDateForUser($user)
     {
-        $userSettingsDate = Piwik_UsersManager_API::getInstance()->getUserPreference($user, Piwik_UsersManager_API::PREFERENCE_DEFAULT_REPORT_DATE);
-        if ($userSettingsDate === false) {
-            return Piwik_Config::getInstance()->General['default_day'];
-        }
-        return $userSettingsDate;
+        return Piwik_UsersManager_API::getInstance()->getUserPreference($user, Piwik_UsersManager_API::PREFERENCE_DEFAULT_REPORT_DATE);
     }
 
     /**