fixed not an array error in AbstractApi.php

JanMalte · JanMalte · commit 574b19905cf3 · 2014-05-13T09:30:13.000+02:00
This will fix array_merge_recursive(): Argument kbsali#2 is not an array in redmine-api/lib/Redmine/Api/AbstractApi.php:121
diff --git a/lib/Redmine/Api/AbstractApi.php b/lib/Redmine/Api/AbstractApi.php
@@ -118,7 +118,8 @@ protected function retrieveAll($endpoint, array $params = array())
             }
             $params['limit'] = $_limit;
             $params['offset'] = $offset;
-            $ret = array_merge_recursive($ret, $this->get($endpoint . '?' . http_build_query($params)));
+            $newDataSet = (array) $this->get($endpoint . '?' . http_build_query($params));
+            $ret = array_merge_recursive($ret, $newDataSet);
             $offset += $_limit;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,8 @@ protected function retrieveAll($endpoint, array $params = array())`
`118`	`118`	`}`
`119`	`119`	`$params['limit'] = $_limit;`
`120`	`120`	`$params['offset'] = $offset;`
`121`		`- $ret = array_merge_recursive($ret, $this->get($endpoint . '?' . http_build_query($params)));`
	`121`	`+ $newDataSet = (array) $this->get($endpoint . '?' . http_build_query($params));`
	`122`	`+ $ret = array_merge_recursive($ret, $newDataSet);`
`122`	`123`	`$offset += $_limit;`
`123`	`124`	`}`
`124`	`125`