[Pkg-owncloud-commits] [owncloud] 161/394: use new obEnd function instead of ob_end_clean

[David Prévot]

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

taffit pushed a commit to annotated tag v4.5.10
in repository owncloud.

commit 4decc86598f5f5a599bcc1067497176c592d53c8
Author: Robin Appelman <icewind at owncloud.com>
Date:   Thu Nov 29 18:01:21 2012 +0100

    use new obEnd function instead of ob_end_clean
---
 apps/files/appinfo/remote.php |    2 +-
 apps/files/download.php       |    2 +-
 lib/eventsource.php           |    4 ++--
 lib/files.php                 |    2 +-
 lib/filesystemview.php        |    2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index 9685e95..b5ede65 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -26,7 +26,7 @@
 $RUNTIME_APPTYPES=array('filesystem','authentication','logging');
 OC_App::loadApps($RUNTIME_APPTYPES);
 
-ob_end_clean();
+OC_Util::obEnd();
 
 // Backends
 $authBackend = new OC_Connector_Sabre_Auth();
diff --git a/apps/files/download.php b/apps/files/download.php
index ff6aefb..ecae70b 100644
--- a/apps/files/download.php
+++ b/apps/files/download.php
@@ -44,5 +44,5 @@ header('Content-Disposition: attachment; filename="'.basename($filename).'"');
 OCP\Response::disableCaching();
 header('Content-Length: '.OC_Filesystem::filesize($filename));
 
- at ob_end_clean();
+OC_Util::obEnd();
 OC_Filesystem::readfile( $filename );
diff --git a/lib/eventsource.php b/lib/eventsource.php
index 900b5b1..a34c2ac 100644
--- a/lib/eventsource.php
+++ b/lib/eventsource.php
@@ -32,7 +32,7 @@ class OC_EventSource{
 	private $fallBackId=0;
 
 	public function __construct() {
-		@ob_end_clean();
+		OC_Util::obEnd();
 		header('Cache-Control: no-cache');
 		$this->fallback=isset($_GET['fallback']) and $_GET['fallback']=='true';
 		if($this->fallback) {
@@ -80,4 +80,4 @@ class OC_EventSource{
 	public function close() {
 		$this->send('__internal__','close');//server side closing can be an issue, let the client do it
 	}
-}
\ No newline at end of file
+}
diff --git a/lib/files.php b/lib/files.php
index d96e9df..e5f244e 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -182,7 +182,7 @@ class OC_Files {
 			$zip=false;
 			$filename=$dir.'/'.$files;
 		}
-		@ob_end_clean();
+		OC_Util::obEnd();
 		if($zip or OC_Filesystem::is_readable($filename)) {
 			header('Content-Disposition: attachment; filename="'.basename($filename).'"');
 			header('Content-Transfer-Encoding: binary');
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index cfd6a40..fa8191c 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -195,7 +195,7 @@ class OC_FilesystemView {
 		return $this->basicOperation('filesize', $path);
 	}
 	public function readfile($path) {
-		@ob_end_clean();
+		OC_Util::obEnd();
 		$handle=$this->fopen($path, 'rb');
 		if ($handle) {
 			$chunkSize = 8192;// 8 MB chunks

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