X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FupdateCollation.php;h=9bcba7e34400b6fb4ccb5fb43429313f6ea97ba5;hb=e65f8ac5110804067366f9f239c13f4f29b66c3d;hp=19fc54a4d751052d53298128adb14481717d04a3;hpb=e2e543f7c2a98f40c9b43ba3989d0f6689f4cb67;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/updateCollation.php b/maintenance/updateCollation.php
index 19fc54a4d7..9bcba7e344 100644
--- a/maintenance/updateCollation.php
+++ b/maintenance/updateCollation.php
@@ -44,10 +44,10 @@ class UpdateCollation extends Maintenance {
 	public function __construct() {
 		parent::__construct();
 
-		global $wgCategoryCollation;
+		$categoryCollation = $this->getConfig()->get( 'CategoryCollation' );
 		$this->addDescription( <<<TEXT
 This script will find all rows in the categorylinks table whose collation is
-out-of-date (cl_collation != '$wgCategoryCollation') and repopulate cl_sortkey
+out-of-date (cl_collation != '$categoryCollation') and repopulate cl_sortkey
 using the page title and cl_sortkey_prefix.  If all collations are
 up-to-date, it will do nothing.
 TEXT
@@ -70,8 +70,6 @@ TEXT
 	}
 
 	public function execute() {
-		global $wgCategoryCollation;
-
 		$dbw = $this->getDB( DB_MASTER );
 		$dbr = $this->getDB( DB_REPLICA );
 		$force = $this->getOption( 'force' );
@@ -81,7 +79,7 @@ TEXT
 			$collationName = $this->getOption( 'target-collation' );
 			$collation = Collation::factory( $collationName );
 		} else {
-			$collationName = $wgCategoryCollation;
+			$collationName = $this->getConfig()->get( 'CategoryCollation' );
 			$collation = Collation::singleton();
 		}