Follow-up 6d4e1547: Hard-deprecate these functions

Only use in Wikimedia production is in GlobalCssJs, below.

Depends-On: I7543fe9ea393901379c16c4f0b1e96fa20955b6f
Change-Id: I66292b179d948e46dba3513f50c3d36012765a9d

diff --git a/includes/Title.php b/includes/Title.php
index 6dc7db5..66aadeb 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1320,7 +1320,7 @@ class Title implements LinkTarget {
         * @deprecated Since 1.31; use ::isSiteConfigPage() instead
         */
        public function isCssOrJsPage() {
         * @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 ) ) );
                return ( NS_MEDIAWIKI == $this->mNamespace
                                && ( $this->hasContentModel( CONTENT_MODEL_CSS )
                                        || $this->hasContentModel( CONTENT_MODEL_JAVASCRIPT ) ) );


@@ -1348,7 +1348,7 @@ class Title implements LinkTarget {
         * @deprecated Since 1.31; use ::isUserConfigPage() instead
         */
        public function isCssJsSubpage() {
         * @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 ) ) );
                return ( NS_USER == $this->mNamespace && $this->isSubpage()
                                && ( $this->hasContentModel( CONTENT_MODEL_CSS )
                                        || $this->hasContentModel( CONTENT_MODEL_JAVASCRIPT ) ) );


@@ -1398,7 +1398,7 @@ class Title implements LinkTarget {
         * @return bool
         */
        public function isCssSubpage() {
         * @return bool
         */
        public function isCssSubpage() {

-               // wfDeprecated( __METHOD__, '1.31' );
+               wfDeprecated( __METHOD__, '1.31' );

                return $this->isUserCssConfigPage();
        }
 
                return $this->isUserCssConfigPage();
        }
 


@@ -1417,11 +1417,11 @@ class Title implements LinkTarget {
        }
 
        /**
        }
 
        /**

-        * @deprecated Since 1.31; use ::isUserCssConfigPage()
+        * @deprecated Since 1.31; use ::isUserJsConfigPage()

         * @return bool
         */
        public function isJsSubpage() {
         * @return bool
         */
        public function isJsSubpage() {

-               // wfDeprecated( __METHOD__, '1.31' );
+               wfDeprecated( __METHOD__, '1.31' );

                return $this->isUserJsConfigPage();
        }
 
                return $this->isUserJsConfigPage();
        }