X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=maintenance%2FcleanupPreferences.php;h=720e3fd8df1063c9c5635dbe4625ce66960e47c6;hp=bed3956a88cc2dd3baa57892ea9f52deae345b9d;hb=8e0ef3e187b4b8ebe847dbc8ae1ec2b96ed58ae0;hpb=e2629248bbd15f9ce6c044a11c47c4cb988d09e8

diff --git a/maintenance/cleanupPreferences.php b/maintenance/cleanupPreferences.php
index bed3956a88..720e3fd8df 100644
--- a/maintenance/cleanupPreferences.php
+++ b/maintenance/cleanupPreferences.php
@@ -59,8 +59,6 @@ class CleanupPreferences extends Maintenance {
 	 *      all values are in that range. Drop ones that aren't.
 	 */
 	public function execute() {
-		global $wgHiddenPrefs, $wgDefaultUserOptions;
-
 		$dbw = $this->getDB( DB_MASTER );
 		$hidden = $this->hasOption( 'hidden' );
 		$unknown = $this->hasOption( 'unknown' );
@@ -73,10 +71,11 @@ class CleanupPreferences extends Maintenance {
 
 		// Remove hidden prefs. Iterate over them to avoid the IN on a large table
 		if ( $hidden ) {
-			if ( !$wgHiddenPrefs ) {
+			$hiddenPrefs = $this->getConfig()->get( 'HiddenPrefs' );
+			if ( !$hiddenPrefs ) {
 				$this->output( "No hidden preferences, skipping\n" );
 			}
-			foreach ( $wgHiddenPrefs as $hiddenPref ) {
+			foreach ( $hiddenPrefs as $hiddenPref ) {
 				$this->deleteByWhere(
 					$dbw,
 					'Dropping hidden preferences',
@@ -87,9 +86,10 @@ class CleanupPreferences extends Maintenance {
 
 		// Remove unknown preferences. Special-case 'userjs-' as we can't control those names.
 		if ( $unknown ) {
+			$defaultUserOptions = $this->getConfig()->get( 'DefaultUserOptions' );
 			$where = [
 				'up_property NOT' . $dbw->buildLike( 'userjs-', $dbw->anyString() ),
-				'up_property NOT IN (' . $dbw->makeList( array_keys( $wgDefaultUserOptions ) ) . ')',
+				'up_property NOT IN (' . $dbw->makeList( array_keys( $defaultUserOptions ) ) . ')',
 			];
 			// Allow extensions to add to the where clause to prevent deletion of their own prefs.
 			Hooks::run( 'DeleteUnknownPreferences', [ &$where, $dbw ] );