From 97653c51427f9c64eec717d2e7f79d2f366800e9 Mon Sep 17 00:00:00 2001
From: sgiehl <stefan@piwik.org>
Date: Fri, 12 Dec 2014 23:05:47 +0100
Subject: [PATCH] small adjustments

---
 core/Updates/{2.10.0-b6.php => 2.10.0-b7.php} | 2 +-
 core/Version.php                              | 2 +-
 plugins/UserSettings/UserSettings.php         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename core/Updates/{2.10.0-b6.php => 2.10.0-b7.php} (96%)

diff --git a/core/Updates/2.10.0-b6.php b/core/Updates/2.10.0-b7.php
similarity index 96%
rename from core/Updates/2.10.0-b6.php
rename to core/Updates/2.10.0-b7.php
index aac4e8b7e4f..a44117fc811 100644
--- a/core/Updates/2.10.0-b6.php
+++ b/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
index 6d2dea8e5a4..7b382341efa 100644
--- 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
index da1e625af0f..f72269dedf4 100644
--- 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';
         }
     }