X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FcleanupPreferences.php;h=b24d72ddda2516c507d6332ef2b1088bb288fabf;hb=86a727b908e7c729d0ccfc67ff6c2cf27ff28928;hp=33cc0ca27d70465821b56fe98faab1e390ac0029;hpb=a175567e1e3e66a4b0468f492cc20271f9a7f116;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/cleanupPreferences.php b/maintenance/cleanupPreferences.php
index 33cc0ca27d..b24d72ddda 100644
--- a/maintenance/cleanupPreferences.php
+++ b/maintenance/cleanupPreferences.php
@@ -39,7 +39,7 @@ class CleanupPreferences extends Maintenance {
 		$this->addOption( 'dry-run', 'Print debug info instead of actually deleting' );
 		$this->addOption( 'hidden', 'Drop hidden preferences ($wgHiddenPrefs)' );
 		$this->addOption( 'unknown',
-			'Drop unknown preferences (not in $wgDefaultUserOptions or a gadget or userjs)' );
+			'Drop unknown preferences (not in $wgDefaultUserOptions or prefixed with "userjs-")' );
 		// TODO: actually implement this
 		// $this->addOption( 'bogus', 'Drop preferences that have invalid/unaccepted values' );
 	}
@@ -84,11 +84,9 @@ class CleanupPreferences extends Maintenance {
 			}
 		}
 
-		// Remove unknown preferences. Special-case gadget- and userjs- as we can't
-		// control those names.
+		// Remove unknown preferences. Special-case 'userjs-' as we can't control those names.
 		if ( $unknown ) {
 			$where = [
-				'up_property NOT' . $dbw->buildLike( 'gadget-', $dbw->anyString() ),
 				'up_property NOT' . $dbw->buildLike( 'userjs-', $dbw->anyString() ),
 				'up_property NOT IN (' . $dbw->makeList( array_keys( $wgDefaultUserOptions ) ) . ')',
 			];