http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72979
Revision: 72979
Author: jeroendedauw
Date: 2010-09-14 15:13:54 +0000 (Tue, 14 Sep 2010)
Log Message:
-----------
Changes for 0.4 - Fixed regression in InRange criterion
Modified Paths:
--------------
trunk/extensions/Validator/includes/criteria/CriterionInRange.php
Modified: trunk/extensions/Validator/includes/criteria/CriterionInRange.php
===================================================================
--- trunk/extensions/Validator/includes/criteria/CriterionInRange.php
2010-09-14 14:48:44 UTC (rev 72978)
+++ trunk/extensions/Validator/includes/criteria/CriterionInRange.php
2010-09-14 15:13:54 UTC (rev 72979)
@@ -13,14 +13,29 @@
*/
class CriterionInRange extends ItemParameterCriterion {
+ /**
+ * Lower bound of the range. Either a number or false, for no lower
limit.
+ *
+ * @since 0.4
+ *
+ * @var mixed
+ */
protected $lowerBound;
+
+ /**
+ * Upper bound of the range. Either a number or false, for no upper
limit.
+ *
+ * @since 0.4
+ *
+ * @var mixed
+ */
protected $upperBound;
/**
* Constructor.
*
- * @param integer $lowerBound
- * @param integer $upperBound
+ * @param mixed $lowerBound
+ * @param mixed $upperBound
*
* @since 0.4
*/
@@ -35,13 +50,14 @@
* @see ItemParameterCriterion::validate
*/
protected function doValidation( $value ) {
- if ( ! is_numeric( $value ) ) {
+ if ( !is_numeric( $value ) ) {
return false;
}
$value = (int)$value;
- return $value <= $this->upperBound && $value >=
$this->lowerBound;
+ return ( $this->upperBound === false || $value <=
$this->upperBound )
+ && ( $this->lowerBound === false || $value >=
$this->lowerBound );
}
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
