mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6988 from owncloud/oc_api_fix_warinigs 

[ocs API] getData() always needs to return an array
This commit is contained in:
Tom Needham 2014-02-10 13:43:16 +00:00
parent eba1d574cf dc53c83e7b
commit 84607db284
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/ocs/result.php
View File

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