http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72282
Revision: 72282
Author: jeroendedauw
Date: 2010-09-03 13:00:46 +0000 (Fri, 03 Sep 2010)
Log Message:
-----------
Changes for 0.4 - follow up to r72281
Modified Paths:
--------------
trunk/extensions/Validator/includes/Validator.php
Modified: trunk/extensions/Validator/includes/Validator.php
===================================================================
--- trunk/extensions/Validator/includes/Validator.php 2010-09-03 12:54:28 UTC
(rev 72281)
+++ trunk/extensions/Validator/includes/Validator.php 2010-09-03 13:00:46 UTC
(rev 72282)
@@ -547,27 +547,16 @@
$hasNoErrors = false;
$this->registerError(
- 'Demo: List error
invamid',
- /* TODO
- wfMsgExt(
-
'validator_error_required_missing',
- 'parsemag',
- $paramName
+
$this->getCriteriaErrorMessage(
+ $criteriaName,
+
$this->mParameters[$name]['original-name'],
+
$this->mParameters[$name]['original-value'],
+ $criteriaArgs,
+ true
),
- */
$criteriaName
- );
+ );
- /*
- $this->mErrors[] = array(
- 'type' => ,
- 'args' => $criteriaArgs,
- 'name' =>
$this->mParameters[$name]['original-name'],
- 'list' => true,
- 'value' =>
$this->mParameters[$name]['original-value']
- );
- */
-
if (
!self::$accumulateParameterErrors ) {
break;
}
@@ -635,26 +624,16 @@
$value = $validItems;
$this->registerError(
- 'Demo: Invalid
item in list',
- /* TODO
- wfMsgExt(
-
'validator_error_required_missing',
-
'parsemag',
-
$paramName
+
$this->getCriteriaErrorMessage(
+
$criteriaName,
+
$this->mParameters[$name]['original-name'],
+
$this->mParameters[$name]['original-value'],
+
$criteriaArgs,
+ true,
+
$invalidItems
),
- */
$criteriaName
- );
-
- /*
- $this->mErrors[] =
array(
- 'type' =>
$criteriaName,
- 'args' =>
$criteriaArgs,
- 'name' =>
$this->mParameters[$name]['original-name'],
- 'list' => true,
- 'invalid-items'
=> $invalidItems
- );
- */
+ );
}
}
}
@@ -666,26 +645,15 @@
// Add a new error when the validation failed,
and break the loop if errors for one parameter should not be accumulated.
if ( !$isValid ) {
$this->registerError(
- 'Demo: parameter validation
failed',
- /* TODO
- wfMsgExt(
-
'validator_error_required_missing',
- 'parsemag',
- $paramName
+ $this->getCriteriaErrorMessage(
+ $criteriaName,
+
$this->mParameters[$name]['original-name'],
+
$this->mParameters[$name]['original-value'],
+ $criteriaArgs,
+ is_array( $value )
),
- */
$criteriaName
- );
-
- /*
- $this->mErrors[] = array(
- 'type' => $criteriaName,
- 'args' => $criteriaArgs,
- 'name' =>
$this->mParameters[$name]['original-name'],
- 'list' => is_array( $value ),
- 'value' =>
$this->mParameters[$name]['original-value']
- );
- */
+ );
$hasNoErrors = false;
if ( !self::$accumulateParameterErrors
) break;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
