From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Sat, 14 Jan 2012 19:17:17 +0000 (+0000)
Subject: r105512: Handle REDIRECT_URL discrepancies and always work with URI paths for thumb... 
X-Git-Tag: 1.31.0-rc.0~25268
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=cae80e37381a3ebeefae2131bc72fc3163580294;p=lhc%2Fweb%2Fwiklou.git

r105512: Handle REDIRECT_URL discrepancies and always work with URI paths for thumb 404 handling
---

diff --git a/thumb.php b/thumb.php
index 51f7ec60d6..7317a6dacc 100644
--- a/thumb.php
+++ b/thumb.php
@@ -46,12 +46,18 @@ function wfThumbHandleRequest() {
  * @return void
  */
 function wfThumbHandle404() {
-	# lighttpd puts the original request in REQUEST_URI, while
-	# sjs sets that to the 404 handler, and puts the original
-	# request in REDIRECT_URL.
+	# lighttpd puts the original request in REQUEST_URI, while sjs sets
+	# that to the 404 handler, and puts the original request in REDIRECT_URL.
 	if ( isset( $_SERVER['REDIRECT_URL'] ) ) {
-		# The URL is un-encoded, so put it back how it was.
+		# The URL is un-encoded, so put it back how it was
 		$uri = str_replace( "%2F", "/", urlencode( $_SERVER['REDIRECT_URL'] ) );
+		# Just get the URI path (REDIRECT_URL is either a full URL or a path)
+		if ( $uri[0] !== '/' ) {
+			$bits = wfParseUrl( $uri );
+			if ( $bits && isset( $bits['path'] ) ) {
+				$uri = $bits['path'];
+			}
+		}
 	} else {
 		$uri = $_SERVER['REQUEST_URI'];
 	}
@@ -215,18 +221,23 @@ function wfStreamThumb( array $params ) {
  * Extract the required params for thumb.php from the thumbnail request URI.
  * At least 'width' and 'f' should be set if the result is an array.
  *
- * @param $uri String Thumbnail request URI
+ * @param $uri String Thumbnail request URI path
  * @return Array|null associative params array or null
  */
 function wfExtractThumbParams( $uri ) {
 	$repo = RepoGroup::singleton()->getLocalRepo();
 
+	$bits = wfParseUrl( $repo->getZoneUrl( 'thumb' ) );
+	if ( !$bits ) {
+		return null;
+	}
+	$zoneUrlRegex = preg_quote( $bits['path'] );
+
 	$hashDirRegex = $subdirRegex = '';
 	for ( $i = 0; $i < $repo->getHashLevels(); $i++ ) {
 		$subdirRegex .= '[0-9a-f]';
 		$hashDirRegex .= "$subdirRegex/";
 	}
-	$zoneUrlRegex = preg_quote( $repo->getZoneUrl( 'thumb' ) );
 
 	$thumbUrlRegex = "!^$zoneUrlRegex(/archive|/temp|)/$hashDirRegex([^/]*)/([^/]*)$!";