| Index: trunk/phase3/RELEASE-NOTES-1.19 |
| — | — | @@ -243,6 +243,8 @@ |
| 244 | 244 | have been replaced with a secondary query argument. |
| 245 | 245 | * The $variant argument in the hooks for the Title::get{Local,Full,Link,Canonical}URL |
| 246 | 246 | methods have been removed, the variant is now part of the $query argument. |
| | 247 | +* Removed Title::isValidCssJsSubpage(), deprecated since 1.17 in favor of |
| | 248 | + using Title::isCssJsSubpage() or checking Title::isWrongCaseCssJsPage() |
| 247 | 249 | |
| 248 | 250 | == Compatibility == |
| 249 | 251 | |
| Index: trunk/phase3/includes/resourceloader/ResourceLoaderWikiModule.php |
| — | — | @@ -27,7 +27,7 @@ |
| 28 | 28 | * |
| 29 | 29 | * This can only be used for wiki pages in the MediaWiki and User namespaces, |
| 30 | 30 | * because of its dependence on the functionality of |
| 31 | | - * Title::isValidCssJsSubpage. |
| | 31 | + * Title::isCssJsSubpage. |
| 32 | 32 | */ |
| 33 | 33 | abstract class ResourceLoaderWikiModule extends ResourceLoaderModule { |
| 34 | 34 | |
| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -967,17 +967,6 @@ |
| 968 | 968 | } |
| 969 | 969 | |
| 970 | 970 | /** |
| 971 | | - * Is this a *valid* .css or .js subpage of a user page? |
| 972 | | - * |
| 973 | | - * @return Bool |
| 974 | | - * @deprecated since 1.17 |
| 975 | | - */ |
| 976 | | - public function isValidCssJsSubpage() { |
| 977 | | - wfDeprecated( __METHOD__, '1.17' ); |
| 978 | | - return $this->isCssJsSubpage(); |
| 979 | | - } |
| 980 | | - |
| 981 | | - /** |
| 982 | 971 | * Trim down a .css or .js subpage title to get the corresponding skin name |
| 983 | 972 | * |
| 984 | 973 | * @return string containing skin name from .css or .js subpage title |
| Index: trunk/phase3/includes/FakeTitle.php |
| — | — | @@ -56,7 +56,6 @@ |
| 57 | 57 | function getSubpages( $limit = -1 ) { $this->error(); } |
| 58 | 58 | function isCssJsSubpage() { $this->error(); } |
| 59 | 59 | function isCssOrJsPage() { $this->error(); } |
| 60 | | - function isValidCssJsSubpage() { $this->error(); } |
| 61 | 60 | function getSkinFromCssJsSubpage() { $this->error(); } |
| 62 | 61 | function isCssSubpage() { $this->error(); } |
| 63 | 62 | function isJsSubpage() { $this->error(); } |
| Index: trunk/extensions/InlineEditor/ExtendedEditPage.class.php |
| — | — | @@ -58,10 +58,10 @@ |
| 59 | 59 | |
| 60 | 60 | $this->isConflict = false; |
| 61 | 61 | // css / js subpages of user pages get a special treatment |
| 62 | | - $this->isCssJsSubpage = $this->mTitle->isCssJsSubpage(); |
| 63 | | - $this->isCssSubpage = $this->mTitle->isCssSubpage(); |
| 64 | | - $this->isJsSubpage = $this->mTitle->isJsSubpage(); |
| 65 | | - $this->isValidCssJsSubpage = $this->mTitle->isValidCssJsSubpage(); |
| | 62 | + $this->isCssJsSubpage = $this->mTitle->isCssJsSubpage(); |
| | 63 | + $this->isCssSubpage = $this->mTitle->isCssSubpage(); |
| | 64 | + $this->isJsSubpage = $this->mTitle->isJsSubpage(); |
| | 65 | + $this->isWrongCaseCssJsPage = $this->isWrongCaseCssJsPage(); |
| 66 | 66 | |
| 67 | 67 | // catch the HTML that the intro throws |
| 68 | 68 | // if anything is thrown, fall back to the normal editor |
| Index: trunk/extensions/MetavidWiki/includes/MV_MetavidInterface/MV_EditPageAjax.php |
| — | — | @@ -188,8 +188,8 @@ |
| 189 | 189 | |
| 190 | 190 | $this->isConflict = false; |
| 191 | 191 | // css / js subpages of user pages get a special treatment |
| 192 | | - $this->isCssJsSubpage = $this->mTitle->isCssJsSubpage(); |
| 193 | | - $this->isValidCssJsSubpage = $this->mTitle->isValidCssJsSubpage(); |
| | 192 | + $this->isCssJsSubpage = $this->mTitle->isCssJsSubpage(); |
| | 193 | + $this->isWrongCaseCssJsPage = $this->isWrongCaseCssJsPage(); |
| 194 | 194 | |
| 195 | 195 | /* Notice that we can't use isDeleted, because it returns true if article is ever deleted |
| 196 | 196 | * no matter it's current state |
| — | — | @@ -485,7 +485,7 @@ |
| 486 | 486 | } else { |
| 487 | 487 | if ( $this->isCssJsSubpage && $this->formtype != 'preview' ) { |
| 488 | 488 | # Check the skin exists |
| 489 | | - if ( $this->isValidCssJsSubpage ) { |
| | 489 | + if ( !$this->isWrongCaseCssJsPage ) { |
| 490 | 490 | $wgOut->addWikiText( wfMsg( 'usercssjsyoucanpreview' ) ); |
| 491 | 491 | } else { |
| 492 | 492 | $wgOut->addWikiText( wfMsg( 'userinvalidcssjstitle', $this->mTitle->getSkinFromCssJsSubpage() ) ); |