Fix typo in r97044 reported in twn

[lhc/web/wiklou.git] / thumb.php

diff --git a/thumb.php b/thumb.php
index 64f24c1..61fd788 100644 (file)
--- a/thumb.php
+++ b/thumb.php
@@ -7,12 +7,14 @@
  * @ingroup Media
  */
 define( 'MW_NO_OUTPUT_COMPRESSION', 1 );
-require_once( './includes/WebStart.php' );
+if ( isset( $_SERVER['MW_COMPILED'] ) ) {
+       require ( 'phase3/includes/WebStart.php' );
+} else {
+       require ( dirname( __FILE__ ) . '/includes/WebStart.php' );
+}
 
 $wgTrivialMimeDetection = true; //don't use fancy mime detection, just check the file extension for jpg/gif/png.
 
-require_once( "$IP/includes/StreamFile.php" );
-
 wfThumbMain();
 wfLogProfilingData();
 
@@ -41,7 +43,7 @@ function wfThumbMain() {
        if ( isset( $params['p'] ) ) {
                $params['page'] = $params['p'];
        }
-       unset( $params['r'] );
+       unset( $params['r'] ); // ignore 'r' because we unconditionally pass File::RENDER
 
        // Is this a thumb of an archived file?
        $isOld = (isset( $params['archived'] ) && $params['archived']);
@@ -56,11 +58,13 @@ function wfThumbMain() {
                $bits = explode( '!', $fileName, 2 );
                if( !isset($bits[1]) ) {
                        wfThumbError( 404, wfMsg( 'badtitletext' ) );
+                       wfProfileOut( __METHOD__ );
                        return;
                }
                $title = Title::makeTitleSafe( NS_FILE, $bits[1] );
                if( is_null($title) ) {
                        wfThumbError( 404, wfMsg( 'badtitletext' ) );
+                       wfProfileOut( __METHOD__ );
                        return;
                }
                $img = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $title, $fileName );
@@ -73,6 +77,7 @@ function wfThumbMain() {
                if ( !$img->getTitle()->userCanRead() ) {
                        wfThumbError( 403, 'Access denied. You do not have permission to access ' . 
                                'the source file.' );
+                       wfProfileOut( __METHOD__ );
                        return;
                }
                $headers[] = 'Cache-Control: private';
@@ -81,15 +86,18 @@ function wfThumbMain() {
 
        if ( !$img ) {
                wfThumbError( 404, wfMsg( 'badtitletext' ) );
+               wfProfileOut( __METHOD__ );
                return;
        }
        if ( !$img->exists() ) {
                wfThumbError( 404, 'The source file for the specified thumbnail does not exist.' );
+               wfProfileOut( __METHOD__ );
                return;
        }
        $sourcePath = $img->getPath();
        if ( $sourcePath === false ) {
                wfThumbError( 500, 'The source file is not locally accessible.' );
+               wfProfileOut( __METHOD__ );
                return;
        }
 
@@ -105,6 +113,7 @@ function wfThumbMain() {
                wfRestoreWarnings();
                if ( $stat['mtime'] <= $imsUnix ) {
                        header( 'HTTP/1.1 304 Not Modified' );
+                       wfProfileOut( __METHOD__ );
                        return;
                }
        }
@@ -115,12 +124,14 @@ function wfThumbMain() {
                        $thumbPath = $img->getThumbPath( $thumbName );
 
                        if ( is_file( $thumbPath ) ) {
-                               wfStreamFile( $thumbPath, $headers );
+                               StreamFile::stream( $thumbPath, $headers );
+                               wfProfileOut( __METHOD__ );
                                return;
                        }
                }
        } catch ( MWException $e ) {
                wfThumbError( 500, $e->getHTML() );
+               wfProfileOut( __METHOD__ );
                return;
        }
 
@@ -142,7 +153,7 @@ function wfThumbMain() {
                $errorMsg = wfMsgHtml( 'thumbnail_error', 'Image was not scaled, ' .
                        'is the requested width bigger than the source?' );
        } else {
-               wfStreamFile( $thumb->getPath(), $headers );
+               StreamFile::stream( $thumb->getPath(), $headers );
        }
        if ( $errorMsg !== false ) {
                wfThumbError( 500, $errorMsg );