From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Fri, 17 Apr 2015 07:13:54 +0000 (+0200)
Subject: Merge pull request #15679 from owncloud/fix-private-member-access
X-Git-Tag: v8.1.0alpha2~56
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f32d97750c33942db53a56d1deceacb2ed3e779b;p=nextcloud-server.git

Merge pull request #15679 from owncloud/fix-private-member-access

Fix private member access of parent class in ocsresponse
---

f32d97750c33942db53a56d1deceacb2ed3e779b
diff --cc lib/public/appframework/http/ocsresponse.php
index c098e306656,9ab582e8ae0..52d3c2fa665
--- a/lib/public/appframework/http/ocsresponse.php
+++ b/lib/public/appframework/http/ocsresponse.php
@@@ -88,13 -86,10 +88,13 @@@ class OCSResponse extends Response 
  		}
  	}
  
 -
 +	/**
 +	 * @return string
 +	 * @since 8.1.0
 +	 */
  	public function render() {
  		return OC_OCS::generateXml(
- 			$this->format, $this->status, $this->statuscode, $this->message,
+ 			$this->format, $this->getStatus(), $this->statuscode, $this->message,
  			$this->data, $this->tag, $this->tagattribute, $this->dimension,
  			$this->itemscount, $this->itemsperpage
  		);