Merge "Make SpecialWatchlist extend SpecialRecentChanges (temporarily)"

diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index 2288bf2..8a119f5 100644 (file)
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -26,7 +26,7 @@
  *
  * @ingroup SpecialPage
  */
-class SpecialRecentChanges extends IncludableSpecialPage {
+class SpecialRecentChanges extends SpecialPage {
        var $rcOptions, $rcSubpage;
        protected $customFilters;
 
@@ -38,8 +38,12 @@ class SpecialRecentChanges extends IncludableSpecialPage {
         */
        protected $feedFormat;
 
-       public function __construct( $name = 'Recentchanges' ) {
-               parent::__construct( $name );
+       public function __construct( $name = 'Recentchanges', $restriction = '' ) {
+               parent::__construct( $name, $restriction );
+       }
+
+       public function isIncludable() {
+               return true;
        }
 
        /**

diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index 1f4d46f..a680bac 100644 (file)
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -20,7 +20,7 @@
  * @file
  * @ingroup SpecialPage Watchlist
  */
-class SpecialWatchlist extends SpecialPage {
+class SpecialWatchlist extends SpecialRecentChanges {
        protected $customFilters;
 
        /**
@@ -30,6 +30,10 @@ class SpecialWatchlist extends SpecialPage {
                parent::__construct( $page, $restriction );
        }
 
+       public function isIncludable() {
+               return false;
+       }
+
        /**
         * Execute
         * @param $par Parameter passed to the page
@@ -502,8 +506,4 @@ class SpecialWatchlist extends SpecialPage {
 
                return floor( $count / 2 );
        }
-
-       protected function getGroupName() {
-               return 'changes';
-       }
 }