From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 4 Jun 2015 07:31:04 +0200
Subject: Update to MediaWiki 1.25.1

---
 includes/filerepo/RepoGroup.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'includes/filerepo/RepoGroup.php')

diff --git a/includes/filerepo/RepoGroup.php b/includes/filerepo/RepoGroup.php
index fab42162..050c4290 100644
--- a/includes/filerepo/RepoGroup.php
+++ b/includes/filerepo/RepoGroup.php
@@ -114,7 +114,7 @@ class RepoGroup {
 	 *   private:        If true, return restricted (deleted) files if the current
 	 *                   user is allowed to view them. Otherwise, such files will not
 	 *                   be found.
-	 *   bypassCache:    If true, do not use the process-local cache of File objects
+	 *   latest:         If true, load from the latest available data into File objects
 	 * @return File|bool False if title is not found
 	 */
 	function findFile( $title, $options = array() ) {
@@ -122,6 +122,10 @@ class RepoGroup {
 			// MW 1.15 compat
 			$options = array( 'time' => $options );
 		}
+		if ( isset( $options['bypassCache'] ) ) {
+			$options['latest'] = $options['bypassCache']; // b/c
+		}
+
 		if ( !$this->reposInitialised ) {
 			$this->initialiseRepos();
 		}
-- 
cgit v1.2.3-54-g00ecf