Merge branch 'archwiki'

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

1 files changed, 6 insertions, 4 deletions

diff --git a/maintenance/rebuildLocalisationCache.php b/maintenance/rebuildLocalisationCache.php
index b7f306b1..b04639c0 100644
--- a/maintenance/rebuildLocalisationCache.php
+++ b/maintenance/rebuildLocalisationCache.php
@@ -52,6 +52,7 @@ class RebuildLocalisationCache extends Maintenance {
 		if ( $this->hasOption( 'memory-limit' ) ) {
 			return parent::memoryLimit();
 		}
+
 		return '1000M';
 	}
 
@@ -90,7 +91,7 @@ class RebuildLocalisationCache extends Maintenance {
 		if ( $this->hasOption( 'outdir' ) ) {
 			$conf['storeDirectory'] = $this->getOption( 'outdir' );
 		}
-		$lc = new LocalisationCache_BulkLoad( $conf );
+		$lc = new LocalisationCacheBulkLoad( $conf );
 
 		$allCodes = array_keys( Language::fetchLanguageNames( null, 'mwfile' ) );
 		if ( $this->hasOption( 'lang' ) ) {
@@ -148,9 +149,9 @@ class RebuildLocalisationCache extends Maintenance {
 	/**
 	 * Helper function to rebuild list of languages codes. Prints the code
 	 * for each language which is rebuilt.
-	 * @param $codes array List of language codes to rebuild.
-	 * @param $lc LocalisationCache Instance of LocalisationCache_BulkLoad (?)
-	 * @param $force bool Rebuild up-to-date languages
+	 * @param array $codes List of language codes to rebuild.
+	 * @param LocalisationCache $lc Instance of LocalisationCacheBulkLoad (?)
+	 * @param bool $force Rebuild up-to-date languages
 	 * @return int Number of rebuilt languages
 	 */
 	private function doRebuild( $codes, $lc, $force ) {
@@ -162,6 +163,7 @@ class RebuildLocalisationCache extends Maintenance {
 				$numRebuilt++;
 			}
 		}
+
 		return $numRebuilt;
 	}