X-Git-Url: https://git.cyclocoop.org/admin/?a=blobdiff_plain;f=maintenance%2FupdateCollation.php;h=06704549470bd19c55a27b47e83f4f688afe7196;hb=388524219c5d86a6869146d2a40abaa811cff55f;hp=54ae1301f103df62051329490b3f856083272eb5;hpb=4b2f95bed5a9ae0a917264abed2ba1fd9fb78f3c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/updateCollation.php b/maintenance/updateCollation.php
index 54ae1301f1..0670454947 100644
--- a/maintenance/updateCollation.php
+++ b/maintenance/updateCollation.php
@@ -187,13 +187,7 @@ TEXT
 				}
 				# cl_type will be wrong for lots of pages if cl_collation is 0,
 				# so let's update it while we're here.
-				if ( $title->getNamespace() == NS_CATEGORY ) {
-					$type = 'subcat';
-				} elseif ( $title->getNamespace() == NS_FILE ) {
-					$type = 'file';
-				} else {
-					$type = 'page';
-				}
+				$type = MWNamespace::getCategoryLinkType( $title->getNamespace() );
 				$newSortKey = $collation->getSortKey(
 					$title->getCategorySortkey( $prefix ) );
 				if ( $verboseStats ) {
@@ -232,12 +226,6 @@ TEXT
 			} else {
 				$this->output( "$count done.\n" );
 			}
-
-			if ( !$dryRun && ++$batchCount % self::SYNC_INTERVAL == 0 ) {
-				$this->output( "Waiting for replica DBs ... " );
-				wfWaitForSlaves();
-				$this->output( "done\n" );
-			}
 		} while ( $res->numRows() == self::BATCH_SIZE );
 
 		if ( !$dryRun ) {