use new obEnd function instead of ob_end_clean

diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index 0ab7e7674c6c9d32b12e17c2043294965a4ec9a8..1713bcc22ce97302f510aef1dea5f13d42674b1d 100644 (file)
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -27,7 +27,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 0d632c9b2c23a9c02c5cbfdd8b0ace18c2d75fb2..6475afb56e07636c395d42ad9769421779036fcd 100644 (file)
--- 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));
 
-@ob_end_clean();
+OC_Util::obEnd();
 OC_Filesystem::readfile( $filename );

diff --git a/lib/eventsource.php b/lib/eventsource.php
index 578441ee707b7703d244b702dd6819cf609846e9..1b8033943a19d6d984a48fe43b82c1efb78d1d65 100644 (file)
--- 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) {

diff --git a/lib/files.php b/lib/files.php
index 912de5655b0dfe4b32bf60341b5c5b34baad78c1..b4a4145a4939c03e7e6fa2e7346528f18d1d5431 100644 (file)
--- a/lib/files.php
+++ b/lib/files.php
@@ -195,7 +195,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 0229213ebcb1a9b7c6dc0eb4f9c33f0290eb94f5..1185c25c240443814054e71a649ce88f52852584 100644 (file)
--- 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