diff --git a/plugins/DevicePlugins/DevicePlugins.php b/plugins/DevicePlugins/DevicePlugins.php index 5ddc6d15d32340a7bed04e1707924b13717ab242..a41a2aeb9de6babc25c0b51ccf262539a096fee2 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 ffebe3b37cf1c0b189c237e926c74c6dea1c14b3..2a3f0740170b7d13b3359676c3d31dc6a00deed2 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 7bd8cc3be00b5233b3c5ee0c4ef1da304b506c55..5ab7692ccf6e1e54dad7d05b5bd7cdacd1079e0b 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 7bb409a5e32b5736692eddf5963243d117b070b6..3238ac11def08db2924a90d743b03b378e9174ba 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'; - } - } }