http://www.mediawiki.org/wiki/Special:Code/MediaWiki/82833
Revision: 82833
Author: aaron
Date: 2011-02-26 06:50:14 +0000 (Sat, 26 Feb 2011)
Log Message:
-----------
Follow-up r82832:
* Removed redundant expiry normalization
* Fixed preloaded default dropdown value for pages with indefinite stability
settings
Modified Paths:
--------------
trunk/extensions/FlaggedRevs/forms/PageStabilityForm.php
Modified: trunk/extensions/FlaggedRevs/forms/PageStabilityForm.php
===================================================================
--- trunk/extensions/FlaggedRevs/forms/PageStabilityForm.php 2011-02-26
03:04:59 UTC (rev 82832)
+++ trunk/extensions/FlaggedRevs/forms/PageStabilityForm.php 2011-02-26
06:50:14 UTC (rev 82833)
@@ -181,10 +181,10 @@
if ( $status !== true ) {
return $status; // bad target
}
- if ( $this->oldConfig ===
FlaggedRevs::getDefaultVisibilitySettings() ) {
- $this->expirySelection = 'infinite'; // no settings are
set
+ if ( $this->oldConfig['expiry'] == Block::infinity() ) {
+ $this->expirySelection = 'infinite'; // no settings set
OR indefinite
} else {
- $this->expirySelection = 'existing'; // settings are set
+ $this->expirySelection = 'existing'; // settings set
and NOT indefinite
}
return $this->reallyPreloadSettings(); // load the params...
}
@@ -276,11 +276,9 @@
$reset = $this->newConfigIsReset();
# Parse and cleanup the expiry time given...
$expiry = $this->getExpiry();
- if ( $reset || $expiry == 'infinite' || $expiry == 'indefinite'
) {
- $expiry = Block::infinity(); // normalize to 'infinity'
- } elseif ( $expiry === false ) {
+ if ( $expiry === false ) {
return 'stabilize_expiry_invalid';
- } elseif ( $expiry < wfTimestampNow() ) {
+ } elseif ( $expiry !== Block::infinity() && $expiry <
wfTimestampNow() ) {
return 'stabilize_expiry_old';
}
# Update the DB row with the new config...
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
