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:
-rw-r--r--core/Updates/2.10.0-b7.php (renamed from core/Updates/2.10.0-b6.php)2
-rw-r--r--core/Version.php2
-rw-r--r--plugins/UserSettings/UserSettings.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/core/Updates/2.10.0-b6.php b/core/Updates/2.10.0-b7.php
index aac4e8b7e4..a44117fc81 100644
--- a/core/Updates/2.10.0-b6.php
+++ b/core/Updates/2.10.0-b7.php
@@ -13,7 +13,7 @@ use Piwik\DataAccess\ArchiveTableCreator;
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 6d2dea8e5a..7b382341ef 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 da1e625af0..f72269dedf 100644
--- a/plugins/UserSettings/UserSettings.php
+++ b/plugins/UserSettings/UserSettings.php
@@ -53,7 +53,7 @@ class UserSettings extends \Piwik\Plugin
$action = $movedMethods[$action];
}
- if ($module == 'UserSettings' && $action == 'getResolution') {
+ if ($module == 'UserSettings' && ($action == 'getResolution' || $action == 'getConfiguration')) {
$module = 'Resolution';
}
}