diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-21 10:36:37 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-21 10:36:37 +0200 |
| commit | cf9b8fc1820bca714907b71812daa22641e2350d (patch) | |
| tree | ba11492f0f0a1ed62105656ee4473cb1cd1ad75c /lib/private/ocs | |
| parent | 26836d4c1770cf7b30ae1e95ee2027c861a925a4 (diff) | |
| parent | e589226f58698dec4fdb95a555bd9c15e96faba5 (diff) | |
| download | nextcloud-server-cf9b8fc1820bca714907b71812daa22641e2350d.tar.gz nextcloud-server-cf9b8fc1820bca714907b71812daa22641e2350d.zip | |
Merge pull request #18184 from owncloud/ocs-merge-headers
Merge headers of ocs results
Diffstat (limited to 'lib/private/ocs')
| -rw-r--r-- | lib/private/ocs/result.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/ocs/result.php b/lib/private/ocs/result.php index 916e25e45ae..2c3f676510c 100644 --- a/lib/private/ocs/result.php +++ b/lib/private/ocs/result.php @@ -51,8 +51,9 @@ class OC_OCS_Result{ * @param mixed $data the data to return * @param int $code * @param null|string $message + * @param array $headers */ - public function __construct($data=null, $code=100, $message=null) { + public function __construct($data = null, $code = 100, $message = null, $headers = []) { if ($data === null) { $this->data = array(); } elseif (!is_array($data)) { @@ -62,6 +63,7 @@ class OC_OCS_Result{ } $this->statusCode = $code; $this->message = $message; + $this->headers = $headers; } /** |