Merge "Clean up: Declare variables with public instead of var"

diff --cc languages/Language.php
Simple merge

diff --cc maintenance/storage/checkStorage.php
Simple merge

diff --cc maintenance/storage/fixBug20757.php
index 21a4957,bda87ac..d394558
--- 1/maintenance/storage/fixBug20757.php
--- 2/maintenance/storage/fixBug20757.php
+++ b/maintenance/storage/fixBug20757.php
@@@ -23,16 -23,11 +23,16 @@@
  
  require_once( __DIR__ . '/../Maintenance.php' );
  
 +/**
 + * Maintenance script to fix bug 20757.
 + *
 + * @ingroup Maintenance ExternalStorage
 + */
  class FixBug20757 extends Maintenance {
-       var $batchSize = 10000;
-       var $mapCache = array();
-       var $mapCacheSize = 0;
-       var $maxMapCacheSize = 1000000;
+       public $batchSize = 10000;
+       public $mapCache = array();
+       public $mapCacheSize = 0;
+       public $maxMapCacheSize = 1000000;
  
        function __construct() {
                parent::__construct();

diff --cc maintenance/storage/recompressTracked.php
index f770681,b5bdbf7..fe62ddf
--- 1/maintenance/storage/recompressTracked.php
--- 2/maintenance/storage/recompressTracked.php
+++ b/maintenance/storage/recompressTracked.php
@@@ -42,26 -42,20 +42,26 @@@ Options
  $job = RecompressTracked::newFromCommandLine( $args, $options );
  $job->execute();
  
 +/**
 + * Maintenance script that moves blobs indexed by trackBlobs.php to a specified
 + * list of destination clusters, and recompresses them in the process.
 + *
 + * @ingroup Maintenance ExternalStorage
 + */
  class RecompressTracked {
-       var $destClusters;
-       var $batchSize = 1000;
-       var $orphanBatchSize = 1000;
-       var $reportingInterval = 10;
-       var $numProcs = 1;
-       var $useDiff, $pageBlobClass, $orphanBlobClass;
-       var $slavePipes, $slaveProcs, $prevSlaveId;
-       var $copyOnly = false;
-       var $isChild = false;
-       var $slaveId = false;
-       var $noCount = false;
-       var $debugLog, $infoLog, $criticalLog;
-       var $store;
+       public $destClusters;
+       public $batchSize = 1000;
+       public $orphanBatchSize = 1000;
+       public $reportingInterval = 10;
+       public $numProcs = 1;
+       public $useDiff, $pageBlobClass, $orphanBlobClass;
+       public $slavePipes, $slaveProcs, $prevSlaveId;
+       public $copyOnly = false;
+       public $isChild = false;
+       public $slaveId = false;
+       public $noCount = false;
+       public $debugLog, $infoLog, $criticalLog;
+       public $store;
  
        static $optionsWithArgs = array( 'procs', 'slave-id', 'debug-log', 'info-log', 'critical-log' );
        static $cmdLineOptionMap = array(