http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72498
Revision: 72498
Author: jeroendedauw
Date: 2010-09-06 16:35:35 +0000 (Mon, 06 Sep 2010)
Log Message:
-----------
Follow up to r72497
Modified Paths:
--------------
trunk/extensions/Validator/includes/Parameter.php
trunk/extensions/Validator/includes/Validator.php
Modified: trunk/extensions/Validator/includes/Parameter.php
===================================================================
--- trunk/extensions/Validator/includes/Parameter.php 2010-09-06 16:17:22 UTC
(rev 72497)
+++ trunk/extensions/Validator/includes/Parameter.php 2010-09-06 16:35:35 UTC
(rev 72498)
@@ -219,21 +219,21 @@
$types = array();
for ( $i = 0, $c = count( $definition['output-types']
); $i < $c; $i++ ) {
- if ( ! is_array(
$definition['output-types'][$i] ) ) {
+ if ( !is_array( $definition['output-types'][$i]
) ) {
$definition['output-types'][$i] =
array( $definition['output-types'][$i] );
}
$types[$name] = $definition['output-types'][$i];
}
- $parameter->outputTypes = $types ;
+ $parameter->outputTypes = $types;
}
elseif ( array_key_exists( 'output-type', $definition ) ) {
if ( ! is_array( $definition['output-type'] ) ) {
$definition['output-type'] = array(
$definition['output-type'] );
}
- $parameter->outputTypes = array( $name =>
$definition['output-type'] );
+ $parameter->outputTypes = array(
$definition['output-type'] );
}
if ( array_key_exists( 'tolower', $definition ) ) {
Modified: trunk/extensions/Validator/includes/Validator.php
===================================================================
--- trunk/extensions/Validator/includes/Validator.php 2010-09-06 16:17:22 UTC
(rev 72497)
+++ trunk/extensions/Validator/includes/Validator.php 2010-09-06 16:35:35 UTC
(rev 72498)
@@ -295,14 +295,14 @@
*/
public function formatParameters() {
foreach ( $this->parameters as $parameter ) {
- foreach ( $parameter->outputTypes as $outputType =>
$arguments ) {
- if ( array_key_exists( $outputType,
self::$mOutputFormats ) ) {
+ foreach ( $parameter->outputTypes as $outputType ) {
+ if ( array_key_exists( $outputType[0],
self::$mOutputFormats ) ) {
$parameters = array(
&$parameter->value, $parameter->getName(), $this->parameters );
$parameters = array_merge( $parameters,
$arguments );
- call_user_func_array(
self::$mOutputFormats[$outputType], $parameters );
+ call_user_func_array(
self::$mOutputFormats[$outputType[0]], $parameters );
}
else {
- throw new Exception( 'There is no
formatting function for output format ' . $outputType );
+ throw new Exception( 'There is no
formatting function for output format ' . $outputType[0] );
}
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
