Removed Title::isValidCssJsSubpage(), deprecated since 1.17 (77309), and updated...

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 3fd9945..67134e5 100644 (file)
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -243,6 +243,8 @@ changes to languages because of Bugzilla reports.
   have been replaced with a secondary query argument.
 * The $variant argument in the hooks for the Title::get{Local,Full,Link,Canonical}URL
   methods have been removed, the variant is now part of the $query argument.
+* Removed Title::isValidCssJsSubpage(), deprecated since 1.17 in favor of
+  using Title::isCssJsSubpage() or checking Title::isWrongCaseCssJsPage()
 
 == Compatibility ==
 

diff --git a/includes/FakeTitle.php b/includes/FakeTitle.php
index 448820d..f913839 100644 (file)
--- a/includes/FakeTitle.php
+++ b/includes/FakeTitle.php
@@ -56,7 +56,6 @@ class FakeTitle extends Title {
        function getSubpages( $limit = -1 ) { $this->error(); }
        function isCssJsSubpage() { $this->error(); }
        function isCssOrJsPage() { $this->error(); }
-       function isValidCssJsSubpage() { $this->error(); }
        function getSkinFromCssJsSubpage() { $this->error(); }
        function isCssSubpage() { $this->error(); }
        function isJsSubpage() { $this->error(); }

diff --git a/includes/Title.php b/includes/Title.php
index 6765ac7..0ac9f2e 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -966,17 +966,6 @@ class Title {
                return ( NS_USER == $this->mNamespace and preg_match( "/\\/.*\\.(?:css|js)$/", $this->mTextform ) );
        }
 
-       /**
-        * Is this a *valid* .css or .js subpage of a user page?
-        *
-        * @return Bool
-        * @deprecated since 1.17
-        */
-       public function isValidCssJsSubpage() {
-               wfDeprecated( __METHOD__, '1.17' );
-               return $this->isCssJsSubpage();
-       }
-
        /**
         * Trim down a .css or .js subpage title to get the corresponding skin name
         *

diff --git a/includes/resourceloader/ResourceLoaderWikiModule.php b/includes/resourceloader/ResourceLoaderWikiModule.php
index fbb3fb1..b137531 100644 (file)
--- a/includes/resourceloader/ResourceLoaderWikiModule.php
+++ b/includes/resourceloader/ResourceLoaderWikiModule.php
@@ -27,7 +27,7 @@ defined( 'MEDIAWIKI' ) || die( 1 );
  *
  * This can only be used for wiki pages in the MediaWiki and User namespaces,
  * because of its dependence on the functionality of
- * Title::isValidCssJsSubpage.
+ * Title::isCssJsSubpage.
  */
 abstract class ResourceLoaderWikiModule extends ResourceLoaderModule {