Merge "Fix selector to align all button types"

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index 801332c..6b3b129 100644 (file)
--- a/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@ -58,7 +58,9 @@ changes to languages because of Phabricator reports.
   removed (deprecated in 1.31).
 * The EDIT_TOKEN_SUFFIX constant was removed (deprecated in 1.27).
   Use MediaWiki\Session\Token::SUFFIX instead.
-* EditPage::isOouiEnabled(), deprecated in 1.30, was removed.
+* EditPage::isOouiEnabled() was removed (deprecated in 1.30).
+* mw.util.wikiGetlink() was removed (deprecated in 1.23).
+  Use mw.util.getUrl() instead.
 
 === Deprecations in 1.32 ===
 * Use of a StartProfiler.php file is deprecated in favour of placing

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/mediawiki.util.js b/resources/src/mediawiki/mediawiki.util.js
index d7b3f35..9f6167a 100644 (file)
--- a/resources/src/mediawiki/mediawiki.util.js
+++ b/resources/src/mediawiki/mediawiki.util.js
@@ -540,13 +540,6 @@
                }
        };
 
-       /**
-        * @method wikiGetlink
-        * @inheritdoc #getUrl
-        * @deprecated since 1.23 Use #getUrl instead.
-        */
-       mw.log.deprecate( util, 'wikiGetlink', util.getUrl, 'Use mw.util.getUrl instead.', 'mw.util.wikiGetlink' );
-
        /**
         * Add the appropriate prefix to the accesskey shown in the tooltip.
         *