Merge "Finish sentence in MultiUsernameFilter documentation"

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index 7ad34fe..3cc300c 100644 (file)
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -187,6 +187,8 @@ because of Phabricator reports.
   was deprecated in 1.25.
 * The jquery.byteLength module, deprecated in 1.31, was removed.
   Use the mediawiki.String module instead.
+* mw.language.specialCharacters, deprecated in 1.33, has been removed.
+  Use require( 'mediawiki.language.specialCharacters' ) instead.
 * …
 
 === Deprecations in 1.34 ===

diff --git a/includes/api/ApiQueryBase.php b/includes/api/ApiQueryBase.php
index 122e02f..2505334 100644 (file)
--- a/includes/api/ApiQueryBase.php
+++ b/includes/api/ApiQueryBase.php
@@ -501,7 +501,7 @@ abstract class ApiQueryBase extends ApiBase {
        /**
         * Same as addPageSubItems(), but one element of $data at a time
         * @param int $pageId Page ID
-        * @param array $item Data array à la ApiResult
+        * @param mixed $item Data à la ApiResult
         * @param string|null $elemname XML element name. If null, getModuleName()
         *  is used
         * @return bool Whether the element fit in the result

diff --git a/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js b/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
index dbf029e..7b7c70d 100644 (file)
--- a/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
+++ b/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
@@ -7,11 +7,11 @@
                        var $a;
                        // Recheck preference so extensions can do a hack to disable this code.
                        if ( parseInt( mw.user.options.get( 'editondblclick' ), 10 ) ) {
-                               e.preventDefault();
                                // Trigger native HTMLElement click instead of opening URL (T45052)
                                $a = $( '#ca-edit a' );
                                // Not every page has an edit link (T59713)
                                if ( $a.length ) {
+                                       e.preventDefault();
                                        // eslint-disable-next-line no-jquery/no-event-shorthand
                                        $a.get( 0 ).click();
                                }

diff --git a/resources/src/mediawiki.language/mediawiki.language.specialCharacters.js b/resources/src/mediawiki.language/mediawiki.language.specialCharacters.js
index 6674adb..710c849 100644 (file)
--- a/resources/src/mediawiki.language/mediawiki.language.specialCharacters.js
+++ b/resources/src/mediawiki.language/mediawiki.language.specialCharacters.js
@@ -1,9 +1 @@
-( function () {
-       var specialCharacters = require( './specialcharacters.json' );
-       // Deprecated since 1.33
-       mw.log.deprecate( mw.language, 'specialCharacters', specialCharacters,
-               'Use require( \'mediawiki.language.specialCharacters\' ) instead',
-               'mw.language.specialCharacters'
-       );
-       module.exports = specialCharacters;
-}() );
+module.exports = require( './specialcharacters.json' );