Merge "Add @since tag for Title::getTalkPageIfDefined"

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 8e38121..51320e2 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4133,6 +4133,7 @@ $wgContentNamespaces = [ NS_MAIN ];
  * Optional array of namespaces which should be blacklisted from Special:ShortPages
  * Only pages inside $wgContentNamespaces but not $wgShortPagesNamespaceBlacklist will
  * be shown on that page.
+ * @since 1.30
  */
 $wgShortPagesNamespaceBlacklist = [];
 

diff --git a/includes/resourceloader/ResourceLoaderMediaWikiUtilModule.php b/includes/resourceloader/ResourceLoaderMediaWikiUtilModule.php
index 1fe3434..166f1ba 100644 (file)
--- a/includes/resourceloader/ResourceLoaderMediaWikiUtilModule.php
+++ b/includes/resourceloader/ResourceLoaderMediaWikiUtilModule.php
@@ -37,6 +37,13 @@ class ResourceLoaderMediaWikiUtilModule extends ResourceLoaderFileModule {
                        . parent::getScript( $context );
        }
 
+       /**
+        * @inheritdoc
+        */
+       public function supportsURLLoading() {
+               return false;
+       }
+
        /**
         * @inheritdoc
         */