From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Mon, 5 Dec 2011 19:17:44 +0000 (+0000)
Subject: FU r104216: keep the r103738 regex check for thumbnails but use the parent directory... 
X-Git-Tag: 1.31.0-rc.0~26171
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=f8d6b31beea91fa79dbdcb93dd161426a457ba3f;p=lhc%2Fweb%2Fwiklou.git

FU r104216: keep the r103738 regex check for thumbnails but use the parent directory as the source file name. This avoids the assumption that the thumb URL starts with /thumb.
---

diff --git a/img_auth.php b/img_auth.php
index 8b121812f6..fc431f8b61 100644
--- a/img_auth.php
+++ b/img_auth.php
@@ -94,12 +94,12 @@ function wfImageAuthMain() {
 		return;
 	}
 
-	// Extract the file name and chop off the size specifier.
+	// Extract the file name and chop off the size specifier
 	// (e.g. 120px-Foo.png => Foo.png or page2-120px-Foo.png => Foo.png).
-	// This only applies to thumbnails, and all thumbnails should
-	// be under a folder that has the source file name.
+	// This only applies to thumbnails, and all thumbnails should have
+	// a width indicator and be under a folder that has the source file name.
 	$name = wfBaseName( $path );
-	if ( strpos( $path, '/thumb/' ) === 0 ) {
+	if ( preg_match( '!(?:[^-]*-)*?\d+px-(.*)!i', $name ) ) {
 		$name = wfBaseName( dirname( $path ) ); // this file is a thumbnail
 	}