jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/367846 )
Change subject: Cap 'days' param in RC/Watchlist at $wgRCMaxAge
..
Cap 'days' param in RC/Watchlist at $wgRCMaxAge
Without this, setting the 'days' param to a very high value
causes exceptions while doing timestamp math.
Bug: T149890
Change-Id: I5aee5f027cced8860eb966e2d6bdb07764ce861a
---
M includes/specials/SpecialRecentchanges.php
M includes/specials/SpecialWatchlist.php
2 files changed, 12 insertions(+), 4 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
Jforrester: Looks good to me, but someone else must approve
diff --git a/includes/specials/SpecialRecentchanges.php
b/includes/specials/SpecialRecentchanges.php
index 1248007..f0c2bc4 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -373,6 +373,7 @@
public function validateOptions( FormOptions $opts ) {
$opts->validateIntBounds( 'limit', 0, 5000 );
+ $opts->validateBounds( 'days', 0, $this->getConfig()->get(
'RCMaxAge' ) / ( 3600 * 24 ) );
parent::validateOptions( $opts );
}
@@ -387,7 +388,7 @@
$query_options, $join_conds, $opts );
// Calculate cutoff
- $cutoff_unixtime = time() - ( $opts['days'] * 86400 );
+ $cutoff_unixtime = time() - $opts['days'] * 3600 * 24;
$cutoff = $dbr->timestamp( $cutoff_unixtime );
$fromValid = preg_match( '/^[0-9]{14}$/', $opts['from'] );
diff --git a/includes/specials/SpecialWatchlist.php
b/includes/specials/SpecialWatchlist.php
index 65131ec..549362f 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -34,6 +34,8 @@
class SpecialWatchlist extends ChangesListSpecialPage {
public function __construct( $page = 'Watchlist', $restriction =
'viewmywatchlist' ) {
parent::__construct( $page, $restriction );
+
+ $this->maxDays = $this->getConfig()->get( 'RCMaxAge' ) / ( 3600
* 24 );
}
public function doesWrites() {
@@ -173,6 +175,11 @@
return $opts;
}
+ public function validateOptions( FormOptions $opts ) {
+ $opts->validateBounds( 'days', 0, $this->maxDays );
+ parent::validateOptions( $opts );
+ }
+
/**
* Get all custom filters
*
@@ -255,7 +262,7 @@
// Calculate cutoff
if ( $opts['days'] > 0 ) {
$conds[] = 'rc_timestamp > ' .
- $dbr->addQuotes( $dbr->timestamp( time() -
intval( $opts['days'] * 86400 ) ) );
+ $dbr->addQuotes( $dbr->timestamp( time() -
$opts['days'] * 3600 * 24 ) );
}
}
@@ -499,7 +506,7 @@
if ( $opts['days'] > 0 ) {
$days = $opts['days'];
} else {
- $days = $this->getConfig()->get( 'RCMaxAge' ) / ( 3600
* 24 );
+ $days = $this->maxDays;
}
$timestamp = wfTimestampNow();
$wlInfo = $this->msg( 'wlnote' )->numParams( $numRows, round(
$days * 24 ) )->params(
@@ -599,7 +606,7 @@
$days[] = $userWatchlistOption;
}
- $maxDays = (string)( $this->getConfig()->get( 'RCMaxAge' ) / (
3600 * 24 ) );
+ $maxDays = (string)$this->maxDays;
// add the maximum possible value, if it isn't available already
if ( !in_array( $maxDays, $days ) ) {
$days[] = $maxDays;
--
To view, visit https://gerrit.wikimedia.org/r/367846
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5aee5f027cced8860eb966e2d6bdb07764ce861a
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Catrope
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Florianschmidtwelzow
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Sbisson
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
