From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Sun, 24 Jan 2016 16:02:59 +0000 (+0100)
Subject: SpecialWatchlist: Display 'wlnote' message even when showing "all" days
X-Git-Tag: 1.31.0-rc.0~8214^2~1
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=7ad9eb2f99dad66c404b6fdce7bf8bf275fe3bcf;p=lhc%2Fweb%2Fwiklou.git

SpecialWatchlist: Display 'wlnote' message even when showing "all" days

Change-Id: Ib22ecd53c7765125cec08a39cecd4d4098d40b9a
---

diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index 7ab657895b..20dde01fb6 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -422,13 +422,15 @@ class SpecialWatchlist extends ChangesListSpecialPage {
 		$this->setTopText( $opts );
 
 		$lang = $this->getLanguage();
-		$wlInfo = '';
 		if ( $opts['days'] > 0 ) {
-			$timestamp = wfTimestampNow();
-			$wlInfo = $this->msg( 'wlnote' )->numParams( $numRows, round( $opts['days'] * 24 ) )->params(
-				$lang->userDate( $timestamp, $user ), $lang->userTime( $timestamp, $user )
-			)->parse() . "<br />\n";
+			$days = $opts['days'];
+		} else {
+			$days = $this->getConfig()->get( 'RCMaxAge' ) / ( 3600 * 24 );
 		}
+		$timestamp = wfTimestampNow();
+		$wlInfo = $this->msg( 'wlnote' )->numParams( $numRows, round( $days * 24 ) )->params(
+			$lang->userDate( $timestamp, $user ), $lang->userTime( $timestamp, $user )
+		)->parse() . "<br />\n";
 
 		$nondefaults = $opts->getChangedValues();
 		$cutofflinks = $this->msg( 'wlshowtime' ) . ' ' . $this->cutoffselector( $opts );