jenkins-bot has submitted this change and it was merged.
Change subject: Fixed method name casing and IDEA warnings in FileRepo
......................................................................
Fixed method name casing and IDEA warnings in FileRepo
Change-Id: I463885a9f425491cd040cb1cdbc4c16925522848
---
M includes/filerepo/RepoGroup.php
M includes/filerepo/file/LocalFile.php
2 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/filerepo/RepoGroup.php b/includes/filerepo/RepoGroup.php
index d515b05..bd32de04 100644
--- a/includes/filerepo/RepoGroup.php
+++ b/includes/filerepo/RepoGroup.php
@@ -135,17 +135,18 @@
}
# 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 f3980f3..396b47c 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -2694,7 +2694,7 @@
// 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;
--
To view, visit https://gerrit.wikimedia.org/r/311367
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I463885a9f425491cd040cb1cdbc4c16925522848
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
