From 63601400e476c6cf43d985f3e7b9864681695ed4 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Fri, 18 Jan 2013 16:46:04 +0100
Subject: Update to MediaWiki 1.20.2

this update includes:
* adjusted Arch Linux skin
* updated FluxBBAuthPlugin
* patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024
---
 includes/filerepo/ForeignDBRepo.php | 40 ++++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 9 deletions(-)

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

diff --git a/includes/filerepo/ForeignDBRepo.php b/includes/filerepo/ForeignDBRepo.php
index 0311ebcd..4b206c3d 100644
--- a/includes/filerepo/ForeignDBRepo.php
+++ b/includes/filerepo/ForeignDBRepo.php
@@ -1,6 +1,21 @@
 <?php
 /**
- * A foreign repository with an accessible MediaWiki database
+ * A foreign repository with an accessible MediaWiki database.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
  *
  * @file
  * @ingroup FileRepo
@@ -21,6 +36,9 @@ class ForeignDBRepo extends LocalRepo {
 	var $fileFactory = array( 'ForeignDBFile', 'newFromTitle' );
 	var $fileFromRowFactory = array( 'ForeignDBFile', 'newFromRow' );
 
+	/**
+	 * @param $info array|null
+	 */
 	function __construct( $info ) {
 		parent::__construct( $info );
 		$this->dbType = $info['dbType'];
@@ -33,6 +51,9 @@ class ForeignDBRepo extends LocalRepo {
 		$this->hasSharedCache = $info['hasSharedCache'];
 	}
 
+	/**
+	 * @return DatabaseBase
+	 */
 	function getMasterDB() {
 		if ( !isset( $this->dbConn ) ) {
 			$this->dbConn = DatabaseBase::factory( $this->dbType,
@@ -49,10 +70,16 @@ class ForeignDBRepo extends LocalRepo {
 		return $this->dbConn;
 	}
 
+	/**
+	 * @return DatabaseBase
+	 */
 	function getSlaveDB() {
 		return $this->getMasterDB();
 	}
 
+	/**
+	 * @return bool
+	 */
 	function hasSharedCache() {
 		return $this->hasSharedCache;
 	}
@@ -61,6 +88,7 @@ class ForeignDBRepo extends LocalRepo {
 	 * Get a key on the primary cache for this repository.
 	 * Returns false if the repository's cache is not accessible at this site. 
 	 * The parameters are the parts of the key, as for wfMemcKey().
+	 * @return bool|mixed
 	 */
 	function getSharedCacheKey( /*...*/ ) {
 		if ( $this->hasSharedCache() ) {
@@ -72,13 +100,7 @@ class ForeignDBRepo extends LocalRepo {
 		}
 	}
 
-	function store( $srcPath, $dstZone, $dstRel, $flags = 0 ) {
-		throw new MWException( get_class($this) . ': write operations are not supported' );
-	}
-	function publish( $srcPath, $dstRel, $archiveRel, $flags = 0 ) {
-		throw new MWException( get_class($this) . ': write operations are not supported' );
-	}
-	function deleteBatch( $sourceDestPairs ) {
-		throw new MWException( get_class($this) . ': write operations are not supported' );
+	protected function assertWritableRepo() {
+		throw new MWException( get_class( $this ) . ': write operations are not supported.' );
 	}
 }
-- 
cgit v1.2.2