From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sat, 9 Nov 2013 05:24:24 +0000 (-0800)
Subject: Fixed loading of stat cache entries into the wrong key
X-Git-Tag: 1.31.0-rc.0~18209
X-Git-Url: http://git.cyclocoop.org/%24dirpuce/puce%24spip_lang_rtl.gif?a=commitdiff_plain;h=519883bd67c960998e8cb2eb0cda52f3764192f7;p=lhc%2Fweb%2Fwiklou.git

Fixed loading of stat cache entries into the wrong key

* Silly bug from 2afdc066f52b54faf63f9c980f7ef6a7841dd094 which caused HEAD
  requests. Probably missed in local testing due to memcached.

Change-Id: I3b82ffe964e252eafa5254f7752e5ba45b49ba0e
---

diff --git a/includes/filebackend/SwiftFileBackend.php b/includes/filebackend/SwiftFileBackend.php
index ec2e2c0121..1787d66f2c 100644
--- a/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@ -1706,7 +1706,7 @@ class SwiftFileBackendFileList extends SwiftFileBackendList {
 		$relPath = substr( $path, $this->suffixStart );
 		if ( is_array( $stat ) ) {
 			$storageDir = rtrim( $this->params['dir'], '/' );
-			$this->backend->loadListingStatInternal( "$storageDir/$path", $stat );
+			$this->backend->loadListingStatInternal( "$storageDir/$relPath", $stat );
 		}
 		return $relPath;
 	}