small adjustments

d19dotca · Dec 12, 2014 · 97653c5 · 97653c5
1 parent 719d52b
commit 97653c5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/core/Updates/2.10.0-b6.php → core/Updates/2.10.0-b7.php b/core/Updates/2.10.0-b6.php → core/Updates/2.10.0-b7.php
@@ -13,7 +13,7 @@
 use Piwik\Updater;
 use Piwik\Updates;
 
-class Updates_2_10_0_b6 extends Updates
+class Updates_2_10_0_b7 extends Updates
 {
 
     static function getSql()

diff --git a/core/Version.php b/core/Version.php
@@ -20,5 +20,5 @@ final class Version
      * The current Piwik version.
      * @var string
      */
-    const VERSION = '2.10.0-b6';
+    const VERSION = '2.10.0-b7';
 }
diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php
@@ -53,7 +53,7 @@ public function mapDeprecatedActions(&$module, &$action, &$parameters)
             $action = $movedMethods[$action];
         }
 
-        if ($module == 'UserSettings' && $action == 'getResolution') {
+        if ($module == 'UserSettings' && ($action == 'getResolution' || $action == 'getConfiguration')) {
             $module = 'Resolution';
         }
     }