[Pkg-owncloud-commits] [owncloud] 27/165: Merge pull request #15679 from owncloud/fix-private-member-access

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit f32d97750c33942db53a56d1deceacb2ed3e779b
Merge: 852cc6f 1d30efd
Author: Thomas Müller <thomas.mueller at tmit.eu>
Date:   Fri Apr 17 09:13:54 2015 +0200

    Merge pull request #15679 from owncloud/fix-private-member-access
    
    Fix private member access of parent class in ocsresponse

 lib/public/appframework/http/ocsresponse.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc lib/public/appframework/http/ocsresponse.php
index c098e30,9ab582e..52d3c2f
--- 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
  		);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git