Fix for Bug #29628 - scriptpath Option of maintenance/install.php is ignored

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

diff --git a/thumb.php b/thumb.php
index 1a1dee4..1fe564d 100644 (file)
--- a/thumb.php
+++ b/thumb.php
@@ -7,7 +7,11 @@
  * @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.
 
@@ -41,7 +45,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']);