http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72379
Revision: 72379
Author: jeroendedauw
Date: 2010-09-04 14:44:21 +0000 (Sat, 04 Sep 2010)
Log Message:
-----------
Minor fix
Modified Paths:
--------------
trunk/extensions/Validator/includes/ParserHook.php
trunk/extensions/Validator/includes/Validator.php
Modified: trunk/extensions/Validator/includes/ParserHook.php
===================================================================
--- trunk/extensions/Validator/includes/ParserHook.php 2010-09-04 14:43:45 UTC
(rev 72378)
+++ trunk/extensions/Validator/includes/ParserHook.php 2010-09-04 14:44:21 UTC
(rev 72379)
@@ -53,7 +53,7 @@
* @since 0.4
*/
public function __construct() {
- $this->validator = new Validator( $this->getName() );
+
}
/**
@@ -144,6 +144,8 @@
public function validateAndRender( array $arguments, $parsed ) {
global $egValidatorErrorLevel;
+ $this->validator = new Validator( $this->getName() );
+
if ( $parsed ) {
$this->validator->setParameters( $arguments,
$this->getParameterInfo() );
}
Modified: trunk/extensions/Validator/includes/Validator.php
===================================================================
--- trunk/extensions/Validator/includes/Validator.php 2010-09-04 14:43:45 UTC
(rev 72378)
+++ trunk/extensions/Validator/includes/Validator.php 2010-09-04 14:44:21 UTC
(rev 72379)
@@ -313,7 +313,7 @@
$this->mParameters[$mainName] =
array(
'original-value' =>
$paramData,
'original-name' =>
$paramName,
- );
+ );
}
}
else {
@@ -321,9 +321,9 @@
wfMsgExt(
'validator-error-override-argument',
'parsemag',
- $mainName,
+ $paramName,
$this->mParameters[$mainName]['original-value'],
- 'demo new value' //
TODO: get new value
+ is_array( $paramData )
? $paramData['original-value'] : $paramData
),
'override'
);
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
