diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/admin_export/settings.php | 2 | ||||
| -rw-r--r-- | apps/media/getID3/getid3/extension.cache.dbm.php | 2 | ||||
| -rw-r--r-- | apps/media/getID3/getid3/module.graphic.jpg.php | 2 | ||||
| -rw-r--r-- | apps/media/getID3/getid3/write.id3v2.php | 8 | ||||
| -rw-r--r-- | apps/media/getID3/getid3/write.real.php | 4 | ||||
| -rw-r--r-- | apps/media/server/xml.server.php | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/apps/admin_export/settings.php b/apps/admin_export/settings.php index 1685e5c0ca1..cf1daa250f7 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 051bb1f0d7a..c18b52d5dca 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 0c2db92e636..cd5e986543c 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 9447486e845..32546d18af9 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 1e0240ccf32..14e775812fc 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 2d54c863c79..7e320a7f595 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']){ |
