http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97467
Revision: 97467
Author: jeroendedauw
Date: 2011-09-19 11:09:35 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
fix compat w/ SMW 1.6.2
Modified Paths:
--------------
trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php
trunk/extensions/SemanticCompoundQueries/SemanticCompoundQueries.php
Modified: trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php
===================================================================
--- trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php
2011-09-19 11:07:47 UTC (rev 97466)
+++ trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php
2011-09-19 11:09:35 UTC (rev 97467)
@@ -51,7 +51,16 @@
}
$query_result = new SCQQueryResult(
$next_result->getPrintRequests(), new SMWQuery(), $results, smwfGetStore() );
- return self::getResultFromQueryResult( $query_result,
$other_params, SMW_OUTPUT_WIKI );
+
+ if ( version_compare( SMW_VERSION, '1.6.1', '>' ) ) {
+ $other_params = parent::getProcessedParams(
$other_params );
+ }
+
+ return self::getResultFromQueryResult(
+ $query_result,
+ $other_params,
+ SMW_OUTPUT_WIKI
+ );
}
/**
@@ -171,7 +180,7 @@
* except that formats of type 'debug' and 'count' aren't handled.
*
* @param SCQQueryResult $res
- * @param array $params
+ * @param array $params These need to be the result of a list fed to
getProcessedParams as of SMW 1.6.2
* @param $outputmode
* @param $context
* @param string $format
Modified: trunk/extensions/SemanticCompoundQueries/SemanticCompoundQueries.php
===================================================================
--- trunk/extensions/SemanticCompoundQueries/SemanticCompoundQueries.php
2011-09-19 11:07:47 UTC (rev 97466)
+++ trunk/extensions/SemanticCompoundQueries/SemanticCompoundQueries.php
2011-09-19 11:09:35 UTC (rev 97467)
@@ -17,7 +17,7 @@
if ( !defined( 'MEDIAWIKI' ) ) die();
-define( 'SCQ_VERSION', '0.2.9' );
+define( 'SCQ_VERSION', '0.2.10 alpha' );
$wgExtensionCredits[defined( 'SEMANTIC_EXTENSION_TYPE' ) ? 'semantic' :
'parserhook'][] = array(
'path' => __FILE__,
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
