From: Robin Pepermans Date: Tue, 13 Dec 2011 11:54:02 +0000 (+0000) Subject: Removed Title::isValidCssJsSubpage(), deprecated since 1.17 (77309), and updated... X-Git-Tag: 1.31.0-rc.0~26007 X-Git-Url: http://git.cyclocoop.org/%24dirpuce/puce%24spip_lang_rtl.gif?a=commitdiff_plain;h=013410082a258e5d83ccdaa0482a5a9e2459fc16;p=lhc%2Fweb%2Fwiklou.git Removed Title::isValidCssJsSubpage(), deprecated since 1.17 (77309), and updated all remaining usage in extensions --- diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19 index 3fd9945441..67134e5a83 100644 --- 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 448820d081..f9138396c7 100644 --- 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 6765ac7e15..0ac9f2e167 100644 --- 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 fbb3fb1619..b13753119f 100644 --- 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 {