Skip to content
Extraits de code Groupes Projets
Valider a6b6176e rédigé par sgiehl's avatar sgiehl
Parcourir les fichiers

Removes deprected renameUserSettingsModuleAndAction() methods

parent 63f8d75a
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -25,7 +25,6 @@ class DevicePlugins extends \Piwik\Plugin ...@@ -25,7 +25,6 @@ class DevicePlugins extends \Piwik\Plugin
return array( return array(
'Metrics.getDefaultMetricTranslations' => 'addMetricTranslations', 'Metrics.getDefaultMetricTranslations' => 'addMetricTranslations',
'Live.getAllVisitorDetails' => 'extendVisitorDetails', 'Live.getAllVisitorDetails' => 'extendVisitorDetails',
'Request.getRenamedModuleAndAction' => 'renameUserSettingsModuleAndAction',
); );
} }
...@@ -45,11 +44,4 @@ class DevicePlugins extends \Piwik\Plugin ...@@ -45,11 +44,4 @@ class DevicePlugins extends \Piwik\Plugin
$translations = array_merge($translations, $metrics); $translations = array_merge($translations, $metrics);
} }
public function renameUserSettingsModuleAndAction(&$module, &$action)
{
if ($module == 'UserSettings' && $action == 'getPlugin') {
$module = 'DevicePlugins';
}
}
} }
...@@ -23,7 +23,6 @@ class DevicesDetection extends \Piwik\Plugin ...@@ -23,7 +23,6 @@ class DevicesDetection extends \Piwik\Plugin
{ {
return array( return array(
'Live.getAllVisitorDetails' => 'extendVisitorDetails', 'Live.getAllVisitorDetails' => 'extendVisitorDetails',
'Request.getRenamedModuleAndAction' => 'renameUserSettingsModuleAndAction',
); );
} }
...@@ -48,22 +47,4 @@ class DevicesDetection extends \Piwik\Plugin ...@@ -48,22 +47,4 @@ class DevicesDetection extends \Piwik\Plugin
$visitor['browserCode'] = $instance->getBrowserCode(); $visitor['browserCode'] = $instance->getBrowserCode();
$visitor['browserVersion'] = $instance->getBrowserVersion(); $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];
}
}
} }
...@@ -23,7 +23,6 @@ class Resolution extends \Piwik\Plugin ...@@ -23,7 +23,6 @@ class Resolution extends \Piwik\Plugin
{ {
return array( return array(
'Live.getAllVisitorDetails' => 'extendVisitorDetails', 'Live.getAllVisitorDetails' => 'extendVisitorDetails',
'Request.getRenamedModuleAndAction' => 'renameUserSettingsModuleAndAction',
); );
} }
...@@ -33,11 +32,4 @@ class Resolution extends \Piwik\Plugin ...@@ -33,11 +32,4 @@ class Resolution extends \Piwik\Plugin
$visitor['resolution'] = $instance->getResolution(); $visitor['resolution'] = $instance->getResolution();
} }
public function renameUserSettingsModuleAndAction(&$module, &$action)
{
if ($module == 'UserSettings' && ($action == 'getResolution' || $action == 'getConfiguration')) {
$module = 'Resolution';
}
}
} }
...@@ -23,7 +23,6 @@ class UserLanguage extends \Piwik\Plugin ...@@ -23,7 +23,6 @@ class UserLanguage extends \Piwik\Plugin
{ {
return array( return array(
'Live.getAllVisitorDetails' => 'extendVisitorDetails', 'Live.getAllVisitorDetails' => 'extendVisitorDetails',
'Request.getRenamedModuleAndAction' => 'renameUserSettingsModuleAndAction',
); );
} }
...@@ -45,11 +44,4 @@ class UserLanguage extends \Piwik\Plugin ...@@ -45,11 +44,4 @@ class UserLanguage extends \Piwik\Plugin
$out .= '<h2 piwik-enriched-headline>' . Piwik::translate('UserLanguage_BrowserLanguage') . '</h2>'; $out .= '<h2 piwik-enriched-headline>' . Piwik::translate('UserLanguage_BrowserLanguage') . '</h2>';
$out .= FrontController::getInstance()->fetchDispatch('UserLanguage', 'getLanguage'); $out .= FrontController::getInstance()->fetchDispatch('UserLanguage', 'getLanguage');
} }
public function renameUserSettingsModuleAndAction(&$module, &$action)
{
if ($module == 'UserSettings' && ($action == 'getLanguage' || $action == 'getLanguageCode')) {
$module = 'UserLanguage';
}
}
} }
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter