diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
| commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
| tree | f1fdd326034e05177596851be6a7127615d81498 /includes/StreamFile.php | |
| parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
| parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) | |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'includes/StreamFile.php')
| -rw-r--r-- | includes/StreamFile.php | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/includes/StreamFile.php b/includes/StreamFile.php index 25031501..a52b25b0 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; } |