[FileBackend] Added option for copy script to skip non-UTF8 filenames.

[lhc/web/wiklou.git] / maintenance / upgrade1_5.php

diff --git a/maintenance/upgrade1_5.php b/maintenance/upgrade1_5.php
index 0b2836c..f0807b6 100644 (file)
--- a/maintenance/upgrade1_5.php
+++ b/maintenance/upgrade1_5.php
@@ -39,6 +39,12 @@ define( 'MW_UPGRADE_CALLBACK', null  ); // for self-documentation only
  * @ingroup Maintenance
  */
 class FiveUpgrade extends Maintenance {
+
+       /**
+        * @var DatabaseBase
+        */
+       protected $db;
+
        function __construct() {
                parent::__construct();
 
@@ -101,7 +107,6 @@ class FiveUpgrade extends Maintenance {
 
                $this->cleanupSwaps = array();
                $this->emailAuth = false; # don't preauthenticate emails
-               $this->maxLag    = 10; # if slaves are lagged more than 10 secs, wait
                $this->step      = $this->getOption( 'step', null );
        }
 
@@ -111,7 +116,7 @@ class FiveUpgrade extends Maintenance {
 
        /**
         * Open a connection to the master server with the admin rights.
-        * @return Database
+        * @return DatabaseBase
         * @access private
         */
        function newConnection() {
@@ -136,7 +141,7 @@ class FiveUpgrade extends Maintenance {
         * Open a second connection to the master server, with buffering off.
         * This will let us stream large datasets in and write in chunks on the
         * other end.
-        * @return Database
+        * @return DatabaseBase
         * @access private
         */
        function streamConnection() {
@@ -316,12 +321,14 @@ class FiveUpgrade extends Maintenance {
         */
        function insertChunk( &$chunk ) {
                // Give slaves a chance to catch up
-               wfWaitForSlaves( $this->maxLag );
+               wfWaitForSlaves();
                $this->dbw->insert( $this->chunkTable, $chunk, $this->chunkFunction, $this->chunkOptions );
        }
 
        /**
         * Helper function for copyTable array_filter
+        * @param $x
+        * @return bool
         */
        static private function notUpgradeNull( $x ) {
                return $x !== MW_UPGRADE_NULL;
@@ -335,7 +342,7 @@ class FiveUpgrade extends Maintenance {
         *              MW_UPGRADE_COPY   - straight copy
         *              MW_UPGRADE_ENCODE - for old Latin1 wikis, conv to UTF-8
         *              MW_UPGRADE_NULL   - just put NULL
-        * @param callable $callback An optional callback to modify the data
+        * @param $callback callback An optional callback to modify the data
         *                           or perform other processing. Func should be
         *                           ( object $row, array $copy ) and return $copy
         * @access private
@@ -801,8 +808,10 @@ END;
         * Rename a given image or archived image file to the converted filename,
         * leaving a symlink for URL compatibility.
         *
-        * @param string $oldname pre-conversion filename
-        * @param string $basename pre-conversion base filename for dir hashing, if an archive
+        * @param $oldname string pre-conversion filename
+        * @param $subdirCallback string
+        * @param $basename string pre-conversion base filename for dir hashing, if an archive
+        * @return bool|string
         * @access private
         */
        function renameFile( $oldname, $subdirCallback = 'wfImageDir', $basename = null ) {
@@ -1325,4 +1334,4 @@ END
 }
 
 $maintClass = 'FiveUpgrade';
-require( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );