From 0cb17f950afa0d9c358ab0c86d501cb5c34ef487 Mon Sep 17 00:00:00 2001 From: umherirrender Date: Sat, 10 May 2014 17:08:58 +0200 Subject: [PATCH] Remove B/C classes WatchlistEditor and IPBlockForm There was a rename of these classes in 1.18 For backward compatibility the old name was extending the new one. Change-Id: I8251fb00ced5c3b474f29b245d89d0d3fb2c14da --- RELEASE-NOTES-1.24 | 4 ++++ includes/AutoLoader.php | 2 -- includes/specials/SpecialBlock.php | 4 ---- includes/specials/SpecialEditWatchlist.php | 4 ---- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/RELEASE-NOTES-1.24 b/RELEASE-NOTES-1.24 index ff731393fa..48c07938ae 100644 --- a/RELEASE-NOTES-1.24 +++ b/RELEASE-NOTES-1.24 @@ -73,6 +73,10 @@ changes to languages because of Bugzilla reports. * RevDel_RevisionItem to RevDelRevisionItem * RevDel_RevisionList to RevDelRevisionList +==== Removed classes ==== +* IPBlockForm - Use SpecialBlock directly +* WatchlistEditor - Use SpecialEditWatchlist directly + == Compatibility == MediaWiki 1.24 requires PHP 5.3.2 or later. diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index 8e5b8721d9..09f1667768 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -952,7 +952,6 @@ $wgAutoloadLocalClasses = array( 'HTMLBlockedUsersItemSelect' => 'includes/specials/SpecialBlockList.php', 'ImageListPager' => 'includes/specials/SpecialListfiles.php', 'ImportReporter' => 'includes/specials/SpecialImport.php', - 'IPBlockForm' => 'includes/specials/SpecialBlock.php', 'LinkSearchPage' => 'includes/specials/SpecialLinkSearch.php', 'ListredirectsPage' => 'includes/specials/SpecialListredirects.php', 'ListDuplicatedFilesPage' => 'includes/specials/SpecialListDuplicatedFiles.php', @@ -1063,7 +1062,6 @@ $wgAutoloadLocalClasses = array( 'WantedFilesPage' => 'includes/specials/SpecialWantedfiles.php', 'WantedPagesPage' => 'includes/specials/SpecialWantedpages.php', 'WantedTemplatesPage' => 'includes/specials/SpecialWantedtemplates.php', - 'WatchlistEditor' => 'includes/specials/SpecialEditWatchlist.php', 'WithoutInterwikiPage' => 'includes/specials/SpecialWithoutinterwiki.php', # includes/templates diff --git a/includes/specials/SpecialBlock.php b/includes/specials/SpecialBlock.php index 007850b28a..ccb10066ef 100644 --- a/includes/specials/SpecialBlock.php +++ b/includes/specials/SpecialBlock.php @@ -977,7 +977,3 @@ class SpecialBlock extends FormSpecialPage { return 'users'; } } - -# BC @since 1.18 -class IPBlockForm extends SpecialBlock { -} diff --git a/includes/specials/SpecialEditWatchlist.php b/includes/specials/SpecialEditWatchlist.php index 0c860a5b9d..6aae870554 100644 --- a/includes/specials/SpecialEditWatchlist.php +++ b/includes/specials/SpecialEditWatchlist.php @@ -669,10 +669,6 @@ class SpecialEditWatchlist extends UnlistedSpecialPage { } } -# B/C since 1.18 -class WatchlistEditor extends SpecialEditWatchlist { -} - /** * Extend HTMLForm purely so we can have a more sane way of getting the section headers */ -- 2.20.1