refs matomo-org#1816 do not pass variable by reference, leads to weird issues

tsteur · tsteur · commit e048d2e9d0b8 · 2013-11-21T02:00:48.000Z
diff --git a/core/API/DataTableManipulator.php b/core/API/DataTableManipulator.php
@@ -140,7 +140,7 @@ protected function loadSubtable($dataTable, $row)
      * @param $request
      * @return
      */
-    protected abstract function manipulateSubtableRequest(&$request);
+    protected abstract function manipulateSubtableRequest($request);
 
     /**
      * Extract the API method for loading subtables from the meta data
@@ -164,7 +164,7 @@ protected function callApiAndReturnDataTable($apiModule, $method, $request)
     {
         $class = Request::getClassNameAPI($apiModule);
 
-        $this->manipulateSubtableRequest($request);
+        $request = $this->manipulateSubtableRequest($request);
         $request['serialize'] = 0;
         $request['expanded'] = 0;
 
diff --git a/core/API/DataTableManipulator/Flattener.php b/core/API/DataTableManipulator/Flattener.php
@@ -128,8 +128,10 @@ private function flattenRow(Row $row, DataTable $dataTable,
      *
      * @param array $request
      */
-    protected function manipulateSubtableRequest(&$request)
+    protected function manipulateSubtableRequest($request)
     {
         unset($request['flat']);
+
+        return $request;
     }
 }
diff --git a/core/API/DataTableManipulator/LabelFilter.php b/core/API/DataTableManipulator/LabelFilter.php
@@ -103,9 +103,11 @@ private function doFilterRecursiveDescend($labelParts, $dataTable)
      *
      * @param $request
      */
-    protected function manipulateSubtableRequest(&$request)
+    protected function manipulateSubtableRequest($request)
     {
         unset($request['label']);
+
+        return $request;
     }
 
     /**
diff --git a/core/API/DataTableManipulator/ReportTotalsCalculator.php b/core/API/DataTableManipulator/ReportTotalsCalculator.php
@@ -204,7 +204,7 @@ private function sumColumnValueToTotal(Row $row, $metricId, $totalValues)
      *
      * @param array $request
      */
-    protected function manipulateSubtableRequest(&$request)
+    protected function manipulateSubtableRequest($request)
     {
         $request['totals']        = 0;
         $request['expanded']      = 0;
@@ -218,6 +218,8 @@ protected function manipulateSubtableRequest(&$request)
                 unset($request[$param]);
             }
         }
+
+        return $request;
     }
 
     private function getReportMetadata()

Original file line number	Diff line number	Diff line change
`@@ -128,8 +128,10 @@ private function flattenRow(Row $row, DataTable $dataTable,`
`128`	`128`	`*`
`129`	`129`	`* @param array $request`
`130`	`130`	`*/`
`131`		`- protected function manipulateSubtableRequest(&$request)`
	`131`	`+ protected function manipulateSubtableRequest($request)`
`132`	`132`	`{`
`133`	`133`	`unset($request['flat']);`
	`134`	`+`
	`135`	`+ return $request;`
`134`	`136`	`}`
`135`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,9 +103,11 @@ private function doFilterRecursiveDescend($labelParts, $dataTable)`
`103`	`103`	`*`
`104`	`104`	`* @param $request`
`105`	`105`	`*/`
`106`		`- protected function manipulateSubtableRequest(&$request)`
	`106`	`+ protected function manipulateSubtableRequest($request)`
`107`	`107`	`{`
`108`	`108`	`unset($request['label']);`
	`109`	`+`
	`110`	`+ return $request;`
`109`	`111`	`}`
`110`	`112`
`111`	`113`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ private function sumColumnValueToTotal(Row $row, $metricId, $totalValues)`
`204`	`204`	`*`
`205`	`205`	`* @param array $request`
`206`	`206`	`*/`
`207`		`- protected function manipulateSubtableRequest(&$request)`
	`207`	`+ protected function manipulateSubtableRequest($request)`
`208`	`208`	`{`
`209`	`209`	`$request['totals'] = 0;`
`210`	`210`	`$request['expanded'] = 0;`
`@@ -218,6 +218,8 @@ protected function manipulateSubtableRequest(&$request)`
`218`	`218`	`unset($request[$param]);`
`219`	`219`	`}`
`220`	`220`	`}`
	`221`	`+`
	`222`	`+ return $request;`
`221`	`223`	`}`
`222`	`224`
`223`	`225`	`private function getReportMetadata()`