jenkins-bot has submitted this change and it was merged.
Change subject: Removed pointless cache bypass in Swift backend
......................................................................
Removed pointless cache bypass in Swift backend
* This was added by mistake in 2af7ad8 apparently
Change-Id: Ic4004428095953ce07e1e97da43748eba04f6639
---
M includes/filebackend/SwiftFileBackend.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/filebackend/SwiftFileBackend.php
b/includes/filebackend/SwiftFileBackend.php
index dea1666..a5c835e 100644
--- a/includes/filebackend/SwiftFileBackend.php
+++ b/includes/filebackend/SwiftFileBackend.php
@@ -744,7 +744,7 @@
$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 @@
}
// (a) Check the container
- $cstat = $this->getContainerStat( $srcCont, true );
+ $cstat = $this->getContainerStat( $srcCont );
if ( $cstat === false ) {
$stats[$path] = false;
continue; // ok, nothing to do
--
To view, visit https://gerrit.wikimedia.org/r/115554
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4004428095953ce07e1e97da43748eba04f6639
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf15
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
