From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 26 Feb 2014 01:40:53 +0000 (-0800)
Subject: Removed pointless cache bypass in Swift backend
X-Git-Tag: 1.31.0-rc.0~16816^2
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=96ae9c07e30f972455e7887ba47e2c16c1b599ec;p=lhc%2Fweb%2Fwiklou.git

Removed pointless cache bypass in Swift backend

* This was added by mistake in 2af7ad8 apparently

Change-Id: Ic4004428095953ce07e1e97da43748eba04f6639
---

diff --git a/includes/filebackend/SwiftFileBackend.php b/includes/filebackend/SwiftFileBackend.php
index dea16666db..a5c835e619 100644
--- a/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@ -744,7 +744,7 @@ class SwiftFileBackend extends FileBackendStore {
 		$prefix = ( $dir == '' ) ? null : "{$dir}/";
 		$status = $this->objectListing( $fullCont, 'names', 1, null, $prefix );
 		if ( $status->isOk() ) {
-			return ( count( $status->value ) );
+			return ( count( $status->value ) ) > 0;
 		}
 
 		return null; // error
@@ -1470,7 +1470,7 @@ class SwiftFileBackend extends FileBackendStore {
 			}
 
 			// (a) Check the container
-			$cstat = $this->getContainerStat( $srcCont, true );
+			$cstat = $this->getContainerStat( $srcCont );
 			if ( $cstat === false ) {
 				$stats[$path] = false;
 				continue; // ok, nothing to do