Merge "Sanity check "stashedtexthash" param before checking memcached"

[lhc/web/wiklou.git] / includes / specialpage / ChangesListSpecialPage.php
diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php

index 5f54404..0762bf7 100644 (file)
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -519,16 +519,25 @@ abstract class ChangesListSpecialPage extends SpecialPage {
         public function execute( $subpage ) {
                 $this->rcSubpage = $subpage;
  
-               $this->setHeaders();
-               $this->outputHeader();
-               $this->addModules();
-
                 $rows = $this->getRows();
                 $opts = $this->getOptions();
                 if ( $rows === false ) {
                         $rows = new FakeResultWrapper( [] );
                 }
  
+               // Used by Structured UI app to get results without MW chrome
+               if ( $this->getRequest()->getVal( 'action' ) === 'render' ) {
+                       $this->getOutput()->setArticleBodyOnly( true );
+               }
+
+               // Used by "live update" and "view newest" to check
+               // if there's new changes with minimal data transfer
+               if ( $this->getRequest()->getBool( 'peek' ) ) {
+                       $code = $rows->numRows() > 0 ? 200 : 304;
+                       $this->getOutput()->setStatusCode( $code );
+                       return;
+               }
+
                 $batch = new LinkBatch;
                 foreach ( $rows as $row ) {
                         $batch->add( NS_USER, $row->rc_user_text );
@@ -542,6 +551,10 @@ abstract class ChangesListSpecialPage extends SpecialPage {
                         }
                 }
                 $batch->execute();
+
+               $this->setHeaders();
+               $this->outputHeader();
+               $this->addModules();
                 $this->webOutput( $rows, $opts );
  
                 $rows->free();
@@ -560,10 +573,12 @@ abstract class ChangesListSpecialPage extends SpecialPage {
         /**
          * Include the modules and configuration for the RCFilters app.
          * Conditional on the user having the feature enabled.
+        *
+        * If it is disabled, add a <body> class marking that
          */
         protected function includeRcFiltersApp() {
+               $out = $this->getOutput();
                 if ( $this->isStructuredFilterUiEnabled() ) {
-                       $out = $this->getOutput();
                         $jsData = $this->getStructuredFilterJsData();
  
                         $messages = [];
@@ -571,6 +586,8 @@ abstract class ChangesListSpecialPage extends SpecialPage {
                                 $messages[$key] = $this->msg( $key )->plain();
                         }
  
+                       $out->addBodyClasses( 'mw-rcfilters-enabled' );
+
                         $out->addHTML(
                                 ResourceLoader::makeInlineScript(
                                         ResourceLoader::makeMessageSetScript( $messages )
@@ -603,6 +620,8 @@ abstract class ChangesListSpecialPage extends SpecialPage {
                                         'daysDefault' => $this->getDefaultDays(),
                                 ]
                         );
+               } else {
+                       $out->addBodyClasses( 'mw-rcfilters-disabled' );
                 }
         }
  
@@ -795,6 +814,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
          * ChangesListFilterGroup constructors.
          *
          * There is light processing to simplify core maintenance.
+        * @param array $definition
          */
         protected function registerFiltersFromDefinitions( array $definition ) {
                 $autoFillPriority = -1;
@@ -1537,7 +1557,29 @@ abstract class ChangesListSpecialPage extends SpecialPage {
          * @return bool
          */
         public function isStructuredFilterUiEnabled() {
-               return $this->getUser()->getOption( 'rcenhancedfilters' );
+               if ( $this->getRequest()->getBool( 'rcfilters' ) ) {
+                       return true;
+               }
+
+               if ( $this->getConfig()->get( 'StructuredChangeFiltersShowPreference' ) ) {
+                       return !$this->getUser()->getOption( 'rcenhancedfilters-disable' );
+               } else {
+                       return $this->getUser()->getOption( 'rcenhancedfilters' );
+               }
+       }
+
+       /**
+        * Check whether the structured filter UI is enabled by default (regardless of
+        * this particular user's setting)
+        *
+        * @return bool
+        */
+       public function isStructuredFilterUiEnabledByDefault() {
+               if ( $this->getConfig()->get( 'StructuredChangeFiltersShowPreference' ) ) {
+                       return !$this->getUser()->getDefaultOption( 'rcenhancedfilters-disable' );
+               } else {
+                       return $this->getUser()->getDefaultOption( 'rcenhancedfilters' );
+               }
         }
  
         abstract function getDefaultLimit();