Merge "mediawiki.api.upload: Fix test assumption about <iframe>"

[lhc/web/wiklou.git] / includes / Title.php

diff --git a/includes/Title.php b/includes/Title.php
index 6dc7db5..8dda01f 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -625,20 +625,6 @@ class Title implements LinkTarget {
                return $wgLegalTitleChars;
        }
 
-       /**
-        * Returns a simple regex that will match on characters and sequences invalid in titles.
-        * Note that this doesn't pick up many things that could be wrong with titles, but that
-        * replacing this regex with something valid will make many titles valid.
-        *
-        * @deprecated since 1.25, use MediaWikiTitleCodec::getTitleInvalidRegex() instead
-        *
-        * @return string Regex string
-        */
-       static function getTitleInvalidRegex() {
-               wfDeprecated( __METHOD__, '1.25' );
-               return MediaWikiTitleCodec::getTitleInvalidRegex();
-       }
-
        /**
         * Utility method for converting a character sequence from bytes to Unicode.
         *
@@ -1320,7 +1306,7 @@ class Title implements LinkTarget {
         * @deprecated Since 1.31; use ::isSiteConfigPage() instead
         */
        public function isCssOrJsPage() {
-               // wfDeprecated( __METHOD__, '1.31' );
+               wfDeprecated( __METHOD__, '1.31' );
                return ( NS_MEDIAWIKI == $this->mNamespace
                                && ( $this->hasContentModel( CONTENT_MODEL_CSS )
                                        || $this->hasContentModel( CONTENT_MODEL_JAVASCRIPT ) ) );
@@ -1348,7 +1334,7 @@ class Title implements LinkTarget {
         * @deprecated Since 1.31; use ::isUserConfigPage() instead
         */
        public function isCssJsSubpage() {
-               // wfDeprecated( __METHOD__, '1.31' );
+               wfDeprecated( __METHOD__, '1.31' );
                return ( NS_USER == $this->mNamespace && $this->isSubpage()
                                && ( $this->hasContentModel( CONTENT_MODEL_CSS )
                                        || $this->hasContentModel( CONTENT_MODEL_JAVASCRIPT ) ) );
@@ -1398,7 +1384,7 @@ class Title implements LinkTarget {
         * @return bool
         */
        public function isCssSubpage() {
-               // wfDeprecated( __METHOD__, '1.31' );
+               wfDeprecated( __METHOD__, '1.31' );
                return $this->isUserCssConfigPage();
        }
 
@@ -1417,11 +1403,11 @@ class Title implements LinkTarget {
        }
 
        /**
-        * @deprecated Since 1.31; use ::isUserCssConfigPage()
+        * @deprecated Since 1.31; use ::isUserJsConfigPage()
         * @return bool
         */
        public function isJsSubpage() {
-               // wfDeprecated( __METHOD__, '1.31' );
+               wfDeprecated( __METHOD__, '1.31' );
                return $this->isUserJsConfigPage();
        }