-// Backwards compatibility parameters
-if ( isset( $params['w'] ) ) {
- $params['width'] = $params['w'];
- unset( $params['w'] );
-}
-if ( isset( $params['p'] ) ) {
- $params['page'] = $params['p'];
-}
-unset( $params['r'] );
-
-// Some basic input validation
-$fileName = strtr( $fileName, '\\/', '__' );
-
-// Work out paths, carefully avoiding constructing an Image object because that won't work yet
-try {
- $handler = thumbGetHandler( $fileName );
- if ( $handler ) {
- $imagePath = wfImageDir( $fileName ) . '/' . $fileName;
- $thumbName = $handler->makeParamString( $params ) . "-$fileName";
- $thumbPath = wfImageThumbDir( $fileName ) . '/' . $thumbName;
-
- if ( is_file( $thumbPath ) && filemtime( $thumbPath ) >= filemtime( $imagePath ) ) {
- wfStreamFile( $thumbPath );
- // Can't log profiling data with no Setup.php
- exit;
+ $headers = array();
+
+ // Get input parameters
+ if ( get_magic_quotes_gpc() ) {
+ $params = array_map( 'stripslashes', $_REQUEST );
+ } else {
+ $params = $_REQUEST;
+ }
+
+ $fileName = isset( $params['f'] ) ? $params['f'] : '';
+ unset( $params['f'] );
+
+ // Backwards compatibility parameters
+ if ( isset( $params['w'] ) ) {
+ $params['width'] = $params['w'];
+ unset( $params['w'] );
+ }
+ if ( isset( $params['p'] ) ) {
+ $params['page'] = $params['p'];
+ }
+ unset( $params['r'] );
+
+ // Is this a thumb of an archived file?
+ $isOld = (isset( $params['archived'] ) && $params['archived']);
+ unset( $params['archived'] );
+
+ // Some basic input validation
+ $fileName = strtr( $fileName, '\\/', '__' );
+
+ // Actually fetch the image. Method depends on whether it is archived or not.
+ if( $isOld ) {
+ // Format is <timestamp>!<name>
+ $bits = explode( '!', $fileName, 2 );
+ if( !isset($bits[1]) ) {
+ wfThumbError( 404, wfMsg( 'badtitletext' ) );
+ return;
+ }
+ $title = Title::makeTitleSafe( NS_FILE, $bits[1] );
+ if( is_null($title) ) {
+ wfThumbError( 404, wfMsg( 'badtitletext' ) );
+ return;