From ef179526ab8f18137da1d64d0f31dfd73138b05b Mon Sep 17 00:00:00 2001 From: Stephane Bisson Date: Wed, 29 Mar 2017 12:36:49 -0400 Subject: [PATCH] Special:RecentChangesLinked show "no results" message Bug: T160482 Change-Id: I26743928b359ad052ff53bde281f0479cbe68a99 --- includes/specialpage/ChangesListSpecialPage.php | 13 ++++++++++++- includes/specials/SpecialRecentchanges.php | 6 +----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php index 0a8c9f494f..2ece5aa676 100644 --- a/includes/specialpage/ChangesListSpecialPage.php +++ b/includes/specialpage/ChangesListSpecialPage.php @@ -427,6 +427,7 @@ abstract class ChangesListSpecialPage extends SpecialPage { if ( $rows === false ) { if ( !$this->including() ) { $this->doHeader( $opts, 0 ); + $this->outputNoResults(); $this->getOutput()->setStatusCode( 404 ); } @@ -446,7 +447,6 @@ abstract class ChangesListSpecialPage extends SpecialPage { } } $batch->execute(); - $this->webOutput( $rows, $opts ); $rows->free(); @@ -460,6 +460,17 @@ abstract class ChangesListSpecialPage extends SpecialPage { } } + /** + * Add the "no results" message to the output + */ + protected function outputNoResults() { + $this->getOutput()->addHTML( + '
' . + $this->msg( 'recentchanges-noresult' )->parse() . + '
' + ); + } + /** * Get the database result for this special page instance. Used by ApiFeedRecentChanges. * diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php index 205f7cf02b..3e7971aa40 100644 --- a/includes/specials/SpecialRecentchanges.php +++ b/includes/specials/SpecialRecentchanges.php @@ -398,11 +398,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage { $rclistOutput .= $list->endRecentChangesList(); if ( $rows->numRows() === 0 ) { - $this->getOutput()->addHTML( - '
' . - $this->msg( 'recentchanges-noresult' )->parse() . - '
' - ); + $this->outputNoResults(); if ( !$this->including() ) { $this->getOutput()->setStatusCode( 404 ); } -- 2.20.1