Skip to content
Extraits de code Groupes Projets
Valider 5d75341e rédigé par diosmosis's avatar diosmosis
Parcourir les fichiers

Fix regression, in API\API::doesSuggestedValuesCallbackNeedData() handle...

Fix regression, in API\API::doesSuggestedValuesCallbackNeedData() handle methods and free functions.
parent c5b9769d
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -592,9 +592,19 @@ class API extends \Piwik\Plugin\API ...@@ -592,9 +592,19 @@ class API extends \Piwik\Plugin\API
private function doesSuggestedValuesCallbackNeedData($suggestedValuesCallback) private function doesSuggestedValuesCallbackNeedData($suggestedValuesCallback)
{ {
$methodMetadata = new \ReflectionFunction($suggestedValuesCallback); if (is_string($suggestedValuesCallback)
$parametersCount = $methodMetadata->getNumberOfParameters(); && strpos($suggestedValuesCallback, '::') !== false
return $parametersCount >= 3; ) {
$suggestedValuesCallback = explode('::', $suggestedValuesCallback);
}
if (is_array($suggestedValuesCallback)) {
$methodMetadata = new \ReflectionMethod($suggestedValuesCallback[0], $suggestedValuesCallback[1]);
} else {
$methodMetadata = new \ReflectionFunction($suggestedValuesCallback);
}
return $methodMetadata->getNumberOfParameters() >= 3;
} }
} }
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter