Skip to content
Extraits de code Groupes Projets
Valider e6f17c27 rédigé par Matthieu Napoli's avatar Matthieu Napoli
Parcourir les fichiers

Fixes #6924

plugins/API/Reports/Get.php(70): Warning - array_merge(): Argument 2 is not an array
parent fb24efd2
Branches
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -405,7 +405,7 @@ class Report ...@@ -405,7 +405,7 @@ class Report
* default metric translation for this metric using the {@hook Metrics.getDefaultMetricTranslations} event. If you * default metric translation for this metric using the {@hook Metrics.getDefaultMetricTranslations} event. If you
* want to overwrite any default metric translation you should overwrite this method, call this parent method to * want to overwrite any default metric translation you should overwrite this method, call this parent method to
* get all default translations and overwrite any custom metric translations. * get all default translations and overwrite any custom metric translations.
* @return array * @return array|mixed
* @api * @api
*/ */
public function getProcessedMetrics() public function getProcessedMetrics()
......
...@@ -67,7 +67,10 @@ class Get extends Report ...@@ -67,7 +67,10 @@ class Get extends Report
{ {
$processedMetrics = array(); $processedMetrics = array();
foreach ($this->reportsToMerge as $report) { foreach ($this->reportsToMerge as $report) {
$processedMetrics = array_merge($processedMetrics, $report->getProcessedMetrics()); $reportMetrics = $report->getProcessedMetrics();
if (is_array($reportMetrics)) {
$processedMetrics = array_merge($processedMetrics, $reportMetrics);
}
} }
return $processedMetrics; return $processedMetrics;
} }
......
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