Stop overwriting $cache in User::getCacheKey()

[lhc/web/wiklou.git] / includes / api / ApiFeedRecentChanges.php

diff --git a/includes/api/ApiFeedRecentChanges.php b/includes/api/ApiFeedRecentChanges.php
index 0b04c8c..e5dba8f 100644 (file)
--- a/includes/api/ApiFeedRecentChanges.php
+++ b/includes/api/ApiFeedRecentChanges.php
@@ -63,8 +63,8 @@ class ApiFeedRecentChanges extends ApiBase {
 
                $feedFormat = $this->params['feedformat'];
                $specialClass = $this->params['target'] !== null
-                       ? 'SpecialRecentchangeslinked'
-                       : 'SpecialRecentchanges';
+                       ? SpecialRecentChangesLinked::class
+                       : SpecialRecentChanges::class;
 
                $formatter = $this->getFeedObject( $feedFormat, $specialClass );
 
@@ -90,12 +90,12 @@ class ApiFeedRecentChanges extends ApiBase {
         * Return a ChannelFeed object.
         *
         * @param string $feedFormat Feed's format (either 'rss' or 'atom')
-        * @param string $specialClass Relevant special page name (either 'SpecialRecentchanges' or
-        *     'SpecialRecentchangeslinked')
+        * @param string $specialClass Relevant special page name (either 'SpecialRecentChanges' or
+        *     'SpecialRecentChangesLinked')
         * @return ChannelFeed
         */
        public function getFeedObject( $feedFormat, $specialClass ) {
-               if ( $specialClass === 'SpecialRecentchangeslinked' ) {
+               if ( $specialClass === SpecialRecentChangesLinked::class ) {
                        $title = Title::newFromText( $this->params['target'] );
                        if ( !$title ) {
                                $this->dieWithError( [ 'apierror-invalidtitle', wfEscapeWikiText( $this->params['target'] ) ] );
@@ -169,16 +169,6 @@ class ApiFeedRecentChanges extends ApiBase {
                        'showlinkedto' => false,
                ];
 
-               if ( $config->get( 'AllowCategorizedRecentChanges' ) ) {
-                       $ret += [
-                               'categories' => [
-                                       ApiBase::PARAM_TYPE => 'string',
-                                       ApiBase::PARAM_ISMULTI => true,
-                               ],
-                               'categories_any' => false,
-                       ];
-               }
-
                return $ret;
        }