Merge "Add an option to the title widget to exclude the current page"

[lhc/web/wiklou.git] / maintenance / backup.inc

diff --git a/maintenance/backup.inc b/maintenance/backup.inc
index 1306ae6..38daf64 100644 (file)
--- a/maintenance/backup.inc
+++ b/maintenance/backup.inc
@@ -41,6 +41,7 @@ class BackupDumper extends Maintenance {
        public $revEndId = 0;
        public $dumpUploads = false;
        public $dumpUploadFileContents = false;
+       public $orderRevs = false;
 
        protected $reportingInterval = 100;
        protected $pageCount = 0;
@@ -51,8 +52,8 @@ class BackupDumper extends Maintenance {
        protected $pageCountLast = 0;
        protected $revCountLast = 0;
 
-       protected $outputTypes = array();
-       protected $filterTypes = array();
+       protected $outputTypes = [];
+       protected $filterTypes = [];
 
        protected $ID = 0;
 
@@ -137,8 +138,8 @@ class BackupDumper extends Maintenance {
                if ( $file != '' ) {
                        require_once $file;
                }
-               $register = array( $class, 'register' );
-               call_user_func_array( $register, array( $this ) );
+               $register = [ $class, 'register' ];
+               call_user_func_array( $register, [ $this ] );
        }
 
        function execute() {
@@ -150,7 +151,7 @@ class BackupDumper extends Maintenance {
         */
        function processOptions() {
                $sink = null;
-               $sinks = array();
+               $sinks = [];
 
                $options = $this->orderedOptions;
                foreach ( $options as $arg ) {
@@ -271,7 +272,7 @@ class BackupDumper extends Maintenance {
                } elseif ( is_null( $this->pages ) ) {
                        # Page dumps: all or by page ID range
                        if ( $this->startId || $this->endId ) {
-                               $exporter->pagesByRange( $this->startId, $this->endId );
+                               $exporter->pagesByRange( $this->startId, $this->endId, $this->orderRevs );
                        } elseif ( $this->revStartId || $this->revEndId ) {
                                $exporter->revsByRange( $this->revStartId, $this->revEndId );
                        } else {
@@ -301,7 +302,7 @@ class BackupDumper extends Maintenance {
 
                $dbr = $this->forcedDb;
                if ( $this->forcedDb === null ) {
-                       $dbr = wfGetDB( DB_SLAVE );
+                       $dbr = wfGetDB( DB_REPLICA );
                }
                $this->maxCount = $dbr->selectField( $table, "MAX($field)", '', __METHOD__ );
                $this->startTime = microtime( true );
@@ -321,11 +322,11 @@ class BackupDumper extends Maintenance {
                }
 
                $this->lb = wfGetLBFactory()->newMainLB();
-               $db = $this->lb->getConnection( DB_SLAVE, 'dump' );
+               $db = $this->lb->getConnection( DB_REPLICA, 'dump' );
 
                // Discourage the server from disconnecting us if it takes a long time
                // to read out the big ol' batch query.
-               $db->setSessionOptions( array( 'connTimeout' => 3600 * 24 ) );
+               $db->setSessionOptions( [ 'connTimeout' => 3600 * 24 ] );
 
                return $db;
        }