X-Git-Url: https://git.cyclocoop.org/%28%28?a=blobdiff_plain;f=includes%2FStreamFile.php;h=a52b25b02f9d217c4183418e6a3d3ba4d473552e;hb=366cd53f4a729a6eeb249b82c7770a9771305f63;hp=ef82705988944e351290d8c8a11c3c35db3a0a89;hpb=da39646ddc98bce9cc1243ab217428e449b5d9ae;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/StreamFile.php b/includes/StreamFile.php index ef82705988..a52b25b02f 100644 --- a/includes/StreamFile.php +++ b/includes/StreamFile.php @@ -39,10 +39,8 @@ class StreamFile { * @return bool Success */ public static function stream( $fname, $headers = array(), $sendErrors = true ) { - wfProfileIn( __METHOD__ ); if ( FileBackend::isStoragePath( $fname ) ) { // sanity - wfProfileOut( __METHOD__ ); throw new MWException( __FUNCTION__ . " given storage path '$fname'." ); } @@ -54,14 +52,11 @@ class StreamFile { if ( $res == self::NOT_MODIFIED ) { $ok = true; // use client cache } elseif ( $res == self::READY_STREAM ) { - wfProfileIn( __METHOD__ . '-send' ); $ok = readfile( $fname ); - wfProfileOut( __METHOD__ . '-send' ); } else { $ok = false; // failed } - wfProfileOut( __METHOD__ ); return $ok; } @@ -158,10 +153,14 @@ class StreamFile { # used for thumbnails (thumb.php) if ( $wgTrivialMimeDetection ) { switch ( $ext ) { - case 'gif': return 'image/gif'; - case 'png': return 'image/png'; - case 'jpg': return 'image/jpeg'; - case 'jpeg': return 'image/jpeg'; + case 'gif': + return 'image/gif'; + case 'png': + return 'image/png'; + case 'jpg': + return 'image/jpeg'; + case 'jpeg': + return 'image/jpeg'; } return 'unknown/unknown';