* Added a test for a link with multiple pipes

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

diff --git a/thumb.php b/thumb.php
index 2b40c68..73d2ca9 100644 (file)
--- a/thumb.php
+++ b/thumb.php
@@ -5,10 +5,13 @@
  * If the file exists, we make do with abridged MediaWiki initialisation. 
  */
 
-unset( $IP );
 define( 'MEDIAWIKI', true );
+unset( $IP );
+$wgNoOutputBuffer = true;
+
 require_once( './includes/Defines.php' );
 require_once( './LocalSettings.php' );
+require_once( 'GlobalFunctions.php' );
 require_once( 'Image.php' );
 require_once( 'StreamFile.php' );
 
@@ -25,7 +28,7 @@ if ( get_magic_quotes_gpc() ) {
 // Some basic input validation
 
 $width = intval( $width );
-$fileName = str_replace( '/', '_', $fileName );
+$fileName = strtr( $fileName, '\\/', '__' );
 
 // Work out paths, carefully avoiding constructing an Image object because that won't work yet
 
@@ -34,7 +37,7 @@ $thumbName = "{$width}px-$fileName";
 if ( preg_match( '/\.svg$/', $fileName ) ) {
        $thumbName .= '.png';
 }
-$thumbPath = wfImageThumbDir( $thumbName ) . '/' . $thumbName;
+$thumbPath = wfImageThumbDir( $fileName ) . '/' . $thumbName;
 
 if ( file_exists( $thumbPath ) && filemtime( $thumbPath ) >= filemtime( $imagePath ) ) {
        wfStreamFile( $thumbPath );
@@ -44,18 +47,14 @@ if ( file_exists( $thumbPath ) && filemtime( $thumbPath ) >= filemtime( $imagePa
 // OK, no valid thumbnail, time to get out the heavy machinery
 require_once( 'Setup.php' );
 
-// Force renderThumb() to actually do something
-$wgThumbnailScriptPath = false;
-$wgSharedThumbnailScriptPath = false;
-
 $img = Image::newFromName( $fileName );
 if ( $img ) {
-       $thumb = $img->renderThumb( $width );
+       $thumb = $img->renderThumb( $width, false );
 } else {
        $thumb = false;
 }
 
-if ( $thumb ) {
+if ( $thumb && $thumb->path ) {
        wfStreamFile( $thumb->path );
 } else {
        $badtitle = wfMsg( 'badtitle' );