Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 20 insertions, 4 deletions

diff --git a/includes/filerepo/ForeignDBViaLBRepo.php b/includes/filerepo/ForeignDBViaLBRepo.php
index 7951fb13..8153ffb4 100644
--- a/includes/filerepo/ForeignDBViaLBRepo.php
+++ b/includes/filerepo/ForeignDBViaLBRepo.php
@@ -27,12 +27,23 @@
  * @ingroup FileRepo
  */
 class ForeignDBViaLBRepo extends LocalRepo {
-	var $wiki, $dbName, $tablePrefix;
-	var $fileFactory = array( 'ForeignDBFile', 'newFromTitle' );
-	var $fileFromRowFactory = array( 'ForeignDBFile', 'newFromRow' );
+	/** @var string */
+	protected $wiki;
+
+	/** @var string */
+	protected $dbName;
+
+	/** @var string */
+	protected $tablePrefix;
+
+	/** @var array */
+	protected $fileFactory = array( 'ForeignDBFile', 'newFromTitle' );
+
+	/** @var array */
+	protected $fileFromRowFactory = array( 'ForeignDBFile', 'newFromRow' );
 
 	/**
-	 * @param $info array|null
+	 * @param array|null $info
 	 */
 	function __construct( $info ) {
 		parent::__construct( $info );
@@ -69,6 +80,7 @@ class ForeignDBViaLBRepo extends LocalRepo {
 		if ( $this->hasSharedCache() ) {
 			$args = func_get_args();
 			array_unshift( $args, $this->wiki );
+
 			return implode( ':', $args );
 		} else {
 			return false;
@@ -78,4 +90,8 @@ class ForeignDBViaLBRepo extends LocalRepo {
 	protected function assertWritableRepo() {
 		throw new MWException( get_class( $this ) . ': write operations are not supported.' );
 	}
+
+	public function getInfo() {
+		return FileRepo::getInfo();
+	}
 }