From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 19 Sep 2016 02:12:05 +0000 (-0700)
Subject: Fixed method name casing and IDEA warnings in FileRepo
X-Git-Tag: 1.31.0-rc.0~5491^2
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=5daf81eb202cdf367b059c88e8b08221127352fe;p=lhc%2Fweb%2Fwiklou.git

Fixed method name casing and IDEA warnings in FileRepo

Change-Id: I463885a9f425491cd040cb1cdbc4c16925522848
---

diff --git a/includes/filerepo/RepoGroup.php b/includes/filerepo/RepoGroup.php
index d515b05088..bd32de04e1 100644
--- a/includes/filerepo/RepoGroup.php
+++ b/includes/filerepo/RepoGroup.php
@@ -135,17 +135,18 @@ class RepoGroup {
 		}
 
 		# Check the cache
+		$dbkey = $title->getDBkey();
 		if ( empty( $options['ignoreRedirect'] )
 			&& empty( $options['private'] )
 			&& empty( $options['bypassCache'] )
 		) {
 			$time = isset( $options['time'] ) ? $options['time'] : '';
-			$dbkey = $title->getDBkey();
 			if ( $this->cache->has( $dbkey, $time, 60 ) ) {
 				return $this->cache->get( $dbkey, $time );
 			}
 			$useCache = true;
 		} else {
+			$time = false;
 			$useCache = false;
 		}
 
diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index f3980f3675..396b47cc3c 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -2694,7 +2694,7 @@ class LocalFileRestoreBatch {
 				// Even if some files could be copied, fail entirely as that is the
 				// easiest thing to do without data loss
 				$this->cleanupFailedBatch( $storeStatus, $storeBatch );
-				$status->setOk( false );
+				$status->setOK( false );
 				$this->file->unlock();
 
 				return $status;