Merge pull request #6988 from owncloud/oc_api_fix_warinigs

[ocs API] getData() always needs to return an array

lib/private/ocs/result.php

@@ -29,7 +29,13 @@ class OC_OCS_Result{
 	 * @param $data mixed the data to return
 	 */
 	public function __construct($data=null, $code=100, $message=null) {
+		if ($data === null) {
+			$this->data = array();
+		} elseif (!is_array($data)) {
+			$this->data = array($this->data);
+		} else {
 			$this->data = $data;
+		}
 		$this->statusCode = $code;
 		$this->message = $message;
 	}
@@ -79,7 +85,7 @@ class OC_OCS_Result{
 
 	/**
 	 * get the result data
-	 * @return array|string|int 
+	 * @return array
 	 */
 	public function getData() {
 		return $this->data;