summaryrefslogtreecommitdiffstats
path: root/lib/private/ocs
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-08-10 21:33:50 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-09-21 11:54:46 +0200
commit2c8eaacec79169f141105a42facdd04cf48e1087 (patch)
treed3f5fb8544de8898c1a3bf7e9c2e8eeb5a27a8e1 /lib/private/ocs
parent6006a03ef1361f8805c323627fb6d8e9c37be9cd (diff)
downloadnextcloud-server-2c8eaacec79169f141105a42facdd04cf48e1087.tar.gz
nextcloud-server-2c8eaacec79169f141105a42facdd04cf48e1087.zip
Merge headers of ocs results
Diffstat (limited to 'lib/private/ocs')
-rw-r--r--lib/private/ocs/result.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/ocs/result.php b/lib/private/ocs/result.php
index 42b6166b823..78c0b3bdd6e 100644
--- a/lib/private/ocs/result.php
+++ b/lib/private/ocs/result.php
@@ -51,7 +51,7 @@ class OC_OCS_Result{
* @param int $code
* @param null|string $message
*/
- 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)) {
@@ -61,6 +61,7 @@ class OC_OCS_Result{
}
$this->statusCode = $code;
$this->message = $message;
+ $this->headers = $headers;
}
/**