X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=thumb.php;h=781686092b34f8af74c7d6f899b5fa2592c84580;hb=549311b20552d137e683a8e837be586f9bfd496f;hp=f1d5341fc2b2bc0c2d6e979bc53744ea1b7c724d;hpb=030924934af0f3dbbed76c5ea7d106208a7760ff;p=lhc%2Fweb%2Fwiklou.git

diff --git a/thumb.php b/thumb.php
index f1d5341fc2..781686092b 100644
--- a/thumb.php
+++ b/thumb.php
@@ -170,11 +170,11 @@ function wfStreamThumb( array $params ) {
 
 	// Check the source file storage path
 	if ( !$img->exists() ) {
-		wfThumbError( 404, 'The source file for the specified thumbnail does not exist.' );
+		wfThumbError( 404, "The source file '$fileName' does not exist." );
 		wfProfileOut( __METHOD__ );
 		return;
 	} elseif ( $img->getPath() === false ) {
-		wfThumbError( 500, 'The source file is not locally accessible.' );
+		wfThumbError( 500, "The source file '$fileName' is not locally accessible." );
 		wfProfileOut( __METHOD__ );
 		return;
 	}
@@ -215,9 +215,9 @@ function wfStreamThumb( array $params ) {
 	// Check that the zone relative path matches up so squid caches won't pick
 	// up thumbs that would not be purged on source file deletion (bug 34231).
 	if ( isset( $params['rel404'] ) ) { // thumbnail was handled via 404
-		if ( urldecode( $params['rel404'] ) === $img->getThumbRel( $thumbName ) ) {
+		if ( rawurldecode( $params['rel404'] ) === $img->getThumbRel( $thumbName ) ) {
 			// Request for the canonical thumbnail name
-		} elseif ( urldecode( $params['rel404'] ) === $img->getThumbRel( $thumbName2 ) ) {
+		} elseif ( rawurldecode( $params['rel404'] ) === $img->getThumbRel( $thumbName2 ) ) {
 			// Request for the "long" thumbnail name; redirect to canonical name
 			$response = RequestContext::getMain()->getRequest()->response();
 			$response->header( "HTTP/1.1 301 " . HttpStatus::getMessage( 301 ) );
@@ -234,7 +234,9 @@ function wfStreamThumb( array $params ) {
 			wfProfileOut( __METHOD__ );
 			return;
 		} else {
-			wfThumbError( 404, 'The given path of the specified thumbnail is incorrect.' );
+			wfThumbError( 404, "The given path of the specified thumbnail is incorrect;
+				expected '" . $img->getThumbRel( $thumbName ) . "' but got '" .
+				rawurldecode( $params['rel404'] ) . "'." );
 			wfProfileOut( __METHOD__ );
 			return;
 		}