Revision: 46318
Author: aaron
Date: 2009-01-27 03:47:01 +0000 (Tue, 27 Jan 2009)
Log Message:
-----------
Expiry submission fixes
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/specialpages/Stabilization_body.php
Modified: trunk/extensions/FlaggedRevs/specialpages/Stabilization_body.php
===================================================================
--- trunk/extensions/FlaggedRevs/specialpages/Stabilization_body.php
2009-01-27 03:32:22 UTC (rev 46317)
+++ trunk/extensions/FlaggedRevs/specialpages/Stabilization_body.php
2009-01-27 03:47:01 UTC (rev 46318)
@@ -70,9 +70,9 @@
$this->select = $wgRequest->getInt(
'wpStableconfig-select' );
$this->override = intval( $wgRequest->getBool(
'wpStableconfig-override' ) );
// Custom expiry takes precedence
- $this->expiry = $wgRequest->getText(
'wpStableconfig-expiry' );
+ $this->expiry = $wgRequest->getText(
'mwStabilize-expiry' );
if( strlen($this->expiry) == 0 ) {
- $this->expiry = $wgRequest->getVal(
"wpExpirySelection" );
+ $this->expiry = $wgRequest->getVal(
'wpExpirySelection' );
}
// Custom reason takes precedence
$this->reason = strlen($this->reason) ? $this->reason :
$this->reasonSelection;
@@ -267,9 +267,7 @@
# Take this opportunity to purge out expired configurations
FlaggedRevs::purgeExpiredConfigurations();
- if( $reset ) {
- $expiry = Block::infinity(); // doesn't matter
- } else if( $this->expiry == 'infinite' || $this->expiry ==
'indefinite' ) {
+ if( $reset || $this->expiry == 'infinite' || $this->expiry ==
'indefinite' ) {
$expiry = Block::infinity();
} else {
# Convert GNU-style date, on error returns -1 for PHP
<5.1 and false for PHP >=5.1
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
