From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Sun, 22 Jan 2012 00:33:20 +0000 (+0000)
Subject: * Another fix for SwiftFileBackend file listings
X-Git-Tag: 1.31.0-rc.0~25141
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=ac536340e5309771d05276528e1b2eaa582efd82;p=lhc%2Fweb%2Fwiklou.git

* Another fix for SwiftFileBackend file listings
* Fixed bogus array key reference in SwiftFileBackend constructor
---

diff --git a/includes/filerepo/backend/SwiftFileBackend.php b/includes/filerepo/backend/SwiftFileBackend.php
index 9c9a551442..197236a553 100644
--- a/includes/filerepo/backend/SwiftFileBackend.php
+++ b/includes/filerepo/backend/SwiftFileBackend.php
@@ -52,7 +52,7 @@ class SwiftFileBackend extends FileBackend {
 		);
 		// Optional settings
 		$this->authTTL = isset( $config['swiftAuthTTL'] )
-			? $config['authTTL']
+			? $config['swiftAuthTTL']
 			: 120; // some sane number
 		$this->swiftAnonUser = isset( $config['swiftAnonUser'] )
 			? $config['swiftAnonUser']
@@ -795,7 +795,7 @@ class SwiftFileBackendFileList implements Iterator {
 		if ( $this->dir == '' ) { // whole container
 			$this->suffixStart = 0;
 		} else { // dir within container
-			$this->suffixStart = strlen( $dir ) + 1; // size of "path/to/dir/"
+			$this->suffixStart = strlen( $this->dir ) + 1; // size of "path/to/dir/"
 		}
 	}