X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FStreamFile.php;h=bac4db65fba719280d829be2e10fd342c00161d4;hb=00050cbb4d4d6d0b168a4ee2073e305149ad612d;hp=a52b25b02f9d217c4183418e6a3d3ba4d473552e;hpb=8fe5a94aa059bf93ba1b00fde84ae6b1edf831fd;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/StreamFile.php b/includes/StreamFile.php index a52b25b02f..bac4db65fb 100644 --- a/includes/StreamFile.php +++ b/includes/StreamFile.php @@ -44,9 +44,9 @@ class StreamFile { throw new MWException( __FUNCTION__ . " given storage path '$fname'." ); } - wfSuppressWarnings(); + MediaWiki\suppressWarnings(); $stat = stat( $fname ); - wfRestoreWarnings(); + MediaWiki\restoreWarnings(); $res = self::prepareForStream( $fname, $stat, $headers, $sendErrors ); if ( $res == self::NOT_MODIFIED ) { @@ -78,7 +78,7 @@ class StreamFile { ) { if ( !is_array( $info ) ) { if ( $sendErrors ) { - header( 'HTTP/1.0 404 Not Found' ); + HttpStatus::header( 404 ); header( 'Cache-Control: no-cache' ); header( 'Content-Type: text/html; charset=utf-8' ); $encFile = htmlspecialchars( $path ); @@ -126,7 +126,7 @@ class StreamFile { $modsince = preg_replace( '/;.*$/', '', $_SERVER['HTTP_IF_MODIFIED_SINCE'] ); if ( wfTimestamp( TS_UNIX, $info['mtime'] ) <= strtotime( $modsince ) ) { ini_set( 'zlib.output_compression', 0 ); - header( "HTTP/1.0 304 Not Modified" ); + HttpStatus::header( 304 ); return self::NOT_MODIFIED; // ok } }