Merge "Unbreak the DB updater by removing transaction from doUpdates()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 22 Jul 2016 22:03:11 +0000 (22:03 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 22 Jul 2016 22:03:11 +0000 (22:03 +0000)
1  2 
includes/installer/DatabaseUpdater.php

@@@ -75,7 -75,6 +75,7 @@@ abstract class DatabaseUpdater 
                PopulateFilearchiveSha1::class,
                PopulateBacklinkNamespace::class,
                FixDefaultJsonContentPages::class,
 +              CleanupEmptyCategories::class,
        ];
  
        /**
        public function doUpdates( $what = [ 'core', 'extensions', 'stats' ] ) {
                global $wgVersion;
  
-               $this->db->begin( __METHOD__ );
                $what = array_flip( $what );
                $this->skipSchema = isset( $what['noschema'] ) || $this->fileHandle !== null;
                if ( isset( $what['core'] ) ) {
                        $this->writeSchemaUpdateFile();
                        $this->setAppliedUpdates( "$wgVersion-schema", $this->updatesSkipped );
                }
-               $this->db->commit( __METHOD__ );
        }
  
        /**