Merge "Make password reset & reset token buttons destructive"

diff --git a/includes/specials/SpecialUnblock.php b/includes/specials/SpecialUnblock.php
index fe9202e..b2d5a16 100644 (file)
--- a/includes/specials/SpecialUnblock.php
+++ b/includes/specials/SpecialUnblock.php
@@ -57,6 +57,7 @@ class SpecialUnblock extends SpecialPage {
 
                $out = $this->getOutput();
                $out->setPageTitle( $this->msg( 'unblockip' ) );
+               $out->addModules( [ 'mediawiki.userSuggest' ] );
 
                $form = HTMLForm::factory( 'ooui', $this->getFields(), $this->getContext() );
                $form->setWrapperLegendMsg( 'unblockip' );
@@ -86,11 +87,12 @@ class SpecialUnblock extends SpecialPage {
        protected function getFields() {
                $fields = [
                        'Target' => [
-                               'type' => 'user',
+                               'type' => 'text',
                                'label-message' => 'ipaddressorusername',
                                'autofocus' => true,
                                'size' => '45',
                                'required' => true,
+                               'cssclass' => 'mw-autocomplete-user', // used by mediawiki.userSuggest
                        ],
                        'Name' => [
                                'type' => 'info',

diff --git a/maintenance/populateRevisionLength.php b/maintenance/populateRevisionLength.php
index ffa4ff7..dcb89d1 100644 (file)
--- a/maintenance/populateRevisionLength.php
+++ b/maintenance/populateRevisionLength.php
@@ -103,7 +103,7 @@ class PopulateRevisionLength extends LoggedUpdateMaintenance {
                                                "{$prefix}_len IS NULL",
                                                $dbr->makeList( [
                                                        "{$prefix}_len = 0",
-                                                       "{$prefix}_sha1 != \"phoiac9h4m842xq45sp7s6u21eteeq1\"", // sha1( "" )
+                                                       "{$prefix}_sha1 != " . $dbr->addQuotes( 'phoiac9h4m842xq45sp7s6u21eteeq1' ), // sha1( "" )
                                                ], IDatabase::LIST_AND )
                                        ], IDatabase::LIST_OR )
                                ],

diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.styles.less b/resources/src/mediawiki.action/mediawiki.action.edit.styles.less
index a751cf0..db81ff2 100644 (file)
--- a/resources/src/mediawiki.action/mediawiki.action.edit.styles.less
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.styles.less
@@ -58,7 +58,8 @@
                border-radius: 0 0 2px 2px;
        }
 
-       .editButtons .oo-ui-buttonInputWidget,
+       // Use buttonElement to include ButtonInputWidget and ButtonWidget
+       .editButtons .oo-ui-buttonElement,
        .cancelLink,
        .editHelp {
                margin-top: 0.5em;