diff --git a/apps/admin_export/settings.php b/apps/admin_export/settings.php
index 1685e5c0ca1762bc60c3b2abc9cae744eeb46458..cf1daa250f797f1ab02d3224560ffa75b5eda23e 100644
--- a/apps/admin_export/settings.php
+++ b/apps/admin_export/settings.php
@@ -63,7 +63,7 @@ if (isset($_POST['admin_export'])) {
header("Content-Type: application/zip");
header("Content-Disposition: attachment; filename=" . basename($filename));
header("Content-Length: " . filesize($filename));
- ob_end_clean();
+ @ob_end_clean();
readfile($filename);
unlink($filename);
} else {
diff --git a/apps/media/getID3/getid3/extension.cache.dbm.php b/apps/media/getID3/getid3/extension.cache.dbm.php
index 051bb1f0d7a0e828751249a25037d5b89df70a7e..c18b52d5dca965fdea1c6aaed06277a47ea8f693 100644
--- a/apps/media/getID3/getid3/extension.cache.dbm.php
+++ b/apps/media/getID3/getid3/extension.cache.dbm.php
@@ -90,7 +90,7 @@ class getID3_cached_dbm extends getID3
ob_start(); // nasty, buy the only way to check...
phpinfo();
$contents = ob_get_contents();
- ob_end_clean();
+ @ob_end_clean();
if (!strstr($contents, $cache_type)) {
die('PHP is not compiled --with '.$cache_type.' support, required to use DBM style cache.');
}
diff --git a/apps/media/getID3/getid3/module.graphic.jpg.php b/apps/media/getID3/getid3/module.graphic.jpg.php
index 0c2db92e6367d6d41d61b82e79a67e73bd90836b..cd5e986543c8da0f81be7c6ce8f804d844e54654 100644
--- a/apps/media/getID3/getid3/module.graphic.jpg.php
+++ b/apps/media/getID3/getid3/module.graphic.jpg.php
@@ -62,7 +62,7 @@ class getid3_jpg
$ThisFileInfo['warning'][] = strip_tags($errors);
unset($ThisFileInfo['jpg']['exif']);
}
- ob_end_clean();
+ @ob_end_clean();
} else {
diff --git a/apps/media/getID3/getid3/write.id3v2.php b/apps/media/getID3/getid3/write.id3v2.php
index 9447486e8452465596da08e601fc0a802a754d3f..32546d18af92686864500eb49b5a62066f61d539 100644
--- a/apps/media/getID3/getid3/write.id3v2.php
+++ b/apps/media/getID3/getid3/write.id3v2.php
@@ -68,7 +68,7 @@ class getid3_write_id3v2
} else {
$this->errors[] = 'Could not open '.$this->filename.' mode "r+b" - '.strip_tags(ob_get_contents());
}
- ob_end_clean();
+ @ob_end_clean();
} else {
@@ -80,7 +80,7 @@ class getid3_write_id3v2
} else {
$this->errors[] = 'Could not open '.$this->filename.' mode "wb" - '.strip_tags(ob_get_contents());
}
- ob_end_clean();
+ @ob_end_clean();
}
@@ -106,7 +106,7 @@ class getid3_write_id3v2
fclose($fp_source);
copy($tempfilename, $this->filename);
unlink($tempfilename);
- ob_end_clean();
+ @ob_end_clean();
return true;
} else {
@@ -121,7 +121,7 @@ class getid3_write_id3v2
$this->errors[] = 'Could not open '.$this->filename.' mode "rb" - '.strip_tags(ob_get_contents());
}
- ob_end_clean();
+ @ob_end_clean();
}
return false;
diff --git a/apps/media/getID3/getid3/write.real.php b/apps/media/getID3/getid3/write.real.php
index 1e0240ccf329a7ea6b003e010b6ffa71c9c4f475..14e775812fc565d6fe6b7bd2ac98249b0873e2b9 100644
--- a/apps/media/getID3/getid3/write.real.php
+++ b/apps/media/getID3/getid3/write.real.php
@@ -118,7 +118,7 @@ class getid3_write_real
$this->errors[] = 'Could not open '.$tempfilename.' mode "wb" - '.strip_tags(ob_get_contents());
}
- ob_end_clean();
+ @ob_end_clean();
}
fclose($fp_source);
return false;
@@ -275,7 +275,7 @@ class getid3_write_real
$this->errors[] = 'Could not open '.$tempfilename.' mode "wb" - '.strip_tags(ob_get_contents());
}
- ob_end_clean();
+ @ob_end_clean();
}
fclose($fp_source);
return false;
diff --git a/apps/media/server/xml.server.php b/apps/media/server/xml.server.php
index 2d54c863c79c5ba19870f8d79184af90f97906f7..7e320a7f5958371d549ce27d84139839a9854d77 100644
--- a/apps/media/server/xml.server.php
+++ b/apps/media/server/xml.server.php
@@ -35,7 +35,7 @@ if(!isset($_POST['action']) and isset($_GET['action'])){
foreach($arguments as &$argument){
$argument=stripslashes($argument);
}
-ob_clean();
+@ob_clean();
if(isset($arguments['action'])){
OC_Log::write('media','ampache '.$arguments['action'].' request', OC_Log::DEBUG);
switch($arguments['action']){
diff --git a/files/download.php b/files/download.php
index c8a2692d015359e27e5a9304c07a7dc47e03f9e1..71f91d352f7c66b1a037654c6341d30a1e01d624 100644
--- a/files/download.php
+++ b/files/download.php
@@ -46,6 +46,6 @@ header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
header('Pragma: public');
header('Content-Length: '.OC_Filesystem::filesize($filename));
-ob_end_clean();
+@ob_end_clean();
OC_Filesystem::readfile( $filename );
?>
diff --git a/lib/template.php b/lib/template.php
index a293e63b437ad4e6f80d03fed48b9d313507ec78..440b62003e77dc6343a9ccac57de462c06e6f427 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -293,7 +293,7 @@ class OC_Template{
ob_start();
include( $this->template ); // <-- we have to use include because we pass $_!
$data = ob_get_contents();
- ob_end_clean();
+ @ob_end_clean();
// return the data
return $data;
@@ -319,7 +319,7 @@ class OC_Template{
ob_start();
include( $this->path.$file.'.php' );
$data = ob_get_contents();
- ob_end_clean();
+ @ob_end_clean();
// Daten zurückgeben
return $data;
diff --git a/ocs/v1.php b/ocs/v1.php
index b5eb460664ce0e476818836deebd2f60df3232a8..f5ff6cb6054709908931a4083da630f2e8895a5e 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -22,7 +22,7 @@
*/
require_once('../lib/base.php');
-ob_clean();
+@ob_clean();
OC_OCS::handle();
?>
diff --git a/tests/index.php b/tests/index.php
index 08e53f1a5756591bf56b1da38b158a73372ee95f..34e1d4166ce2a0db21c0d64dda8585cb7b976b47 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -29,7 +29,7 @@ require_once('../lib/base.php');
OC_Util::checkAdminUser();
$testCases=loadFiles(__DIR__,array('index.php','templates'));
-ob_end_clean();
+@ob_end_clean();
$testResults=array();
foreach($testCases as $testCaseClass){
$testCase=new $testCaseClass();
diff --git a/tests/lib/filesystem.php b/tests/lib/filesystem.php
index 4bfa23884f4ea74e88cad28694b03d1cbfd859ce..43cf2e53f3f091378bf2b6372ea2892832aa4ab7 100644
--- a/tests/lib/filesystem.php
+++ b/tests/lib/filesystem.php
@@ -87,7 +87,7 @@ class OC_FILEYSYSTEM_Test extends OC_TestCase
ob_start();
OC_Filesystem::readfile('/dummy');
$this->assertEquals('foo', ob_get_contents(),'Unexpected output of readfile');
- ob_end_clean();
+ @ob_end_clean();
}
public function isReadable(){