Merge "Disable $wgServer autodetection to prevent cache poisoning attacks" into REL1_34

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 635b3e1..7f3bb23 100644 (file)
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -1051,9 +1051,10 @@ class Parser {
        /**
         * Get the language object for language conversion
         * @deprecated since 1.32, just use getTargetLanguage()
-        * @return Language|null
+        * @return Language
         */
        public function getConverterLanguage() {
+               wfDeprecated( __METHOD__, '1.32' );
                return $this->getTargetLanguage();
        }