http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97256
Revision: 97256
Author: jeroendedauw
Date: 2011-09-16 12:24:46 +0000 (Fri, 16 Sep 2011)
Log Message:
-----------
Follow up to r97223;
Modified Paths:
--------------
trunk/extensions/SemanticMaps/includes/queryprinters/SM_MapPrinter.php
Modified: trunk/extensions/SemanticMaps/includes/queryprinters/SM_MapPrinter.php
===================================================================
--- trunk/extensions/SemanticMaps/includes/queryprinters/SM_MapPrinter.php
2011-09-16 12:24:22 UTC (rev 97255)
+++ trunk/extensions/SemanticMaps/includes/queryprinters/SM_MapPrinter.php
2011-09-16 12:24:46 UTC (rev 97256)
@@ -27,13 +27,6 @@
protected $fatalErrorMsg = false;
/**
- * @since 1.0
- *
- * @var array
- */
- protected $parameters;
-
- /**
* Constructor.
*
* @param $format String
@@ -341,31 +334,7 @@
// TODO: this can probably be done cleaner with some changes in Maps
unset( $paramInfo['mappingservice'] );
- if ( version_compare( SMW_VERSION, '1.6', '<' ) ) {
- // Go through the descriptions, and convert them from
Validator- to SMW-style.
- // This if for b/c with SMW 1.5.x; SMW 1.6 directly
accepts Parameter objects.
- foreach ( $paramInfo as $paramDesc ) {
- $param = array(
- 'name' => $paramDesc->getName(),
- 'type' => $this->getMappedParamType(
$paramDesc->getType() ),
- 'description' =>
$paramDesc->getDescription() ? $paramDesc->getDescription() : '',
- 'default' => $paramDesc->isRequired() ?
'' : $paramDesc->getDefault()
- );
-
- foreach ( $paramDesc->getCriteria() as $criterion ) {
- if ( $criterion instanceof CriterionInArray ) {
- $param['values'] =
$criterion->getAllowedValues();
- $param['type'] = $paramDesc->isList() ?
'enum-list' : 'enumeration';
- break;
- }
- }
-
- $params[] = $param;
- }
- }
- else {
- $params = array_merge( $params, $paramInfo );
- }
+ $params = array_merge( $params, $paramInfo );
return $params;
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
