Merge "ChangesListSpecialPage: Don't short-circuit the ChangesList, instead format...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 14 Jul 2017 14:04:10 +0000 (14:04 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 14 Jul 2017 14:04:10 +0000 (14:04 +0000)
1  2 
includes/specialpage/ChangesListSpecialPage.php

@@@ -22,6 -22,7 +22,7 @@@
   */
  use MediaWiki\Logger\LoggerFactory;
  use Wikimedia\Rdbms\ResultWrapper;
+ use Wikimedia\Rdbms\FakeResultWrapper;
  use Wikimedia\Rdbms\IDatabase;
  
  /**
@@@ -518,13 -519,7 +519,7 @@@ abstract class ChangesListSpecialPage e
                $rows = $this->getRows();
                $opts = $this->getOptions();
                if ( $rows === false ) {
-                       if ( !$this->including() ) {
-                               $this->doHeader( $opts, 0 );
-                               $this->outputNoResults();
-                               $this->getOutput()->setStatusCode( 404 );
-                       }
-                       return;
+                       $rows = new FakeResultWrapper( [] );
                }
  
                $batch = new LinkBatch;
                $legend .= Html::closeElement( 'dl' ) . "\n";
  
                # Collapsibility
 +              $legendHeading = $this->getUser()->getOption(
 +                      'rcenhancedfilters'
 +              ) ?
 +                      $context->msg( 'rcfilters-legend-heading' )->parse() :
 +                      $context->msg( 'recentchanges-legend-heading' )->parse();
                $legend =
                        '<div class="mw-changeslist-legend">' .
 -                              $context->msg( 'recentchanges-legend-heading' )->parse() .
 +                              $legendHeading .
                                '<div class="mw-collapsible-content">' . $legend . '</div>' .
                        '</div>';