From a6b6176eb64ef597fe1b0fe089281d2e912289cc Mon Sep 17 00:00:00 2001
From: sgiehl <stefan@piwik.org>
Date: Mon, 31 Oct 2016 22:18:19 +0100
Subject: [PATCH] Removes deprected renameUserSettingsModuleAndAction() methods
---
plugins/DevicePlugins/DevicePlugins.php | 8 --------
plugins/DevicesDetection/DevicesDetection.php | 19 -------------------
plugins/Resolution/Resolution.php | 8 --------
plugins/UserLanguage/UserLanguage.php | 8 --------
4 files changed, 43 deletions(-)
diff --git a/plugins/DevicePlugins/DevicePlugins.php b/plugins/DevicePlugins/DevicePlugins.php
index 5ddc6d15d3..a41a2aeb9d 100644
--- a/plugins/DevicePlugins/DevicePlugins.php
+++ b/plugins/DevicePlugins/DevicePlugins.php
@@ -25,7 +25,6 @@ class DevicePlugins extends \Piwik\Plugin
return array(
'Metrics.getDefaultMetricTranslations' => 'addMetricTranslations',
'Live.getAllVisitorDetails' => 'extendVisitorDetails',
- 'Request.getRenamedModuleAndAction' => 'renameUserSettingsModuleAndAction',
);
}
@@ -45,11 +44,4 @@ class DevicePlugins extends \Piwik\Plugin
$translations = array_merge($translations, $metrics);
}
-
- public function renameUserSettingsModuleAndAction(&$module, &$action)
- {
- if ($module == 'UserSettings' && $action == 'getPlugin') {
- $module = 'DevicePlugins';
- }
- }
}
diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php
index ffebe3b37c..2a3f074017 100644
--- a/plugins/DevicesDetection/DevicesDetection.php
+++ b/plugins/DevicesDetection/DevicesDetection.php
@@ -23,7 +23,6 @@ class DevicesDetection extends \Piwik\Plugin
{
return array(
'Live.getAllVisitorDetails' => 'extendVisitorDetails',
- 'Request.getRenamedModuleAndAction' => 'renameUserSettingsModuleAndAction',
);
}
@@ -48,22 +47,4 @@ class DevicesDetection extends \Piwik\Plugin
$visitor['browserCode'] = $instance->getBrowserCode();
$visitor['browserVersion'] = $instance->getBrowserVersion();
}
-
- public function renameUserSettingsModuleAndAction(&$module, &$action)
- {
- $movedMethods = array(
- 'index' => 'software',
- 'getBrowser' => 'getBrowsers',
- 'getBrowserVersion' => 'getBrowserVersions',
- 'getMobileVsDesktop' => 'getType',
- 'getOS' => 'getOsVersions',
- 'getOSFamily' => 'getOsFamilies',
- 'getBrowserType' => 'getBrowserEngines',
- );
-
- if ($module == 'UserSettings' && array_key_exists($action, $movedMethods)) {
- $module = 'DevicesDetection';
- $action = $movedMethods[$action];
- }
- }
}
diff --git a/plugins/Resolution/Resolution.php b/plugins/Resolution/Resolution.php
index 7bd8cc3be0..5ab7692ccf 100644
--- a/plugins/Resolution/Resolution.php
+++ b/plugins/Resolution/Resolution.php
@@ -23,7 +23,6 @@ class Resolution extends \Piwik\Plugin
{
return array(
'Live.getAllVisitorDetails' => 'extendVisitorDetails',
- 'Request.getRenamedModuleAndAction' => 'renameUserSettingsModuleAndAction',
);
}
@@ -33,11 +32,4 @@ class Resolution extends \Piwik\Plugin
$visitor['resolution'] = $instance->getResolution();
}
-
- public function renameUserSettingsModuleAndAction(&$module, &$action)
- {
- if ($module == 'UserSettings' && ($action == 'getResolution' || $action == 'getConfiguration')) {
- $module = 'Resolution';
- }
- }
}
diff --git a/plugins/UserLanguage/UserLanguage.php b/plugins/UserLanguage/UserLanguage.php
index 7bb409a5e3..3238ac11de 100644
--- a/plugins/UserLanguage/UserLanguage.php
+++ b/plugins/UserLanguage/UserLanguage.php
@@ -23,7 +23,6 @@ class UserLanguage extends \Piwik\Plugin
{
return array(
'Live.getAllVisitorDetails' => 'extendVisitorDetails',
- 'Request.getRenamedModuleAndAction' => 'renameUserSettingsModuleAndAction',
);
}
@@ -45,11 +44,4 @@ class UserLanguage extends \Piwik\Plugin
$out .= '<h2 piwik-enriched-headline>' . Piwik::translate('UserLanguage_BrowserLanguage') . '</h2>';
$out .= FrontController::getInstance()->fetchDispatch('UserLanguage', 'getLanguage');
}
-
- public function renameUserSettingsModuleAndAction(&$module, &$action)
- {
- if ($module == 'UserSettings' && ($action == 'getLanguage' || $action == 'getLanguageCode')) {
- $module = 'UserLanguage';
- }
- }
}
--
GitLab