Remove gadget special-case from preferences cleanup

Avoiding deletion of 'gadget-' preferences is now done in
the Gadgets extension via the hook.

Bug: T188966
Change-Id: I81a070986b6e76a2fcec52617b59e9528e52eba2
Depends-On: I5627f014827fdbf266eb7fdb00a446f81a0c3458

diff --git a/maintenance/cleanupPreferences.php b/maintenance/cleanupPreferences.php
index 33cc0ca..b24d72d 100644 (file)
--- 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 ) ) . ')',
                        ];