| Index: trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php |
| — | — | @@ -51,7 +51,16 @@ |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | $query_result = new SCQQueryResult( $next_result->getPrintRequests(), new SMWQuery(), $results, smwfGetStore() ); |
| 55 | | - return self::getResultFromQueryResult( $query_result, $other_params, SMW_OUTPUT_WIKI ); |
| | 55 | + |
| | 56 | + if ( version_compare( SMW_VERSION, '1.6.1', '>' ) ) { |
| | 57 | + $other_params = parent::getProcessedParams( $other_params ); |
| | 58 | + } |
| | 59 | + |
| | 60 | + return self::getResultFromQueryResult( |
| | 61 | + $query_result, |
| | 62 | + $other_params, |
| | 63 | + SMW_OUTPUT_WIKI |
| | 64 | + ); |
| 56 | 65 | } |
| 57 | 66 | |
| 58 | 67 | /** |
| — | — | @@ -171,7 +180,7 @@ |
| 172 | 181 | * except that formats of type 'debug' and 'count' aren't handled. |
| 173 | 182 | * |
| 174 | 183 | * @param SCQQueryResult $res |
| 175 | | - * @param array $params |
| | 184 | + * @param array $params These need to be the result of a list fed to getProcessedParams as of SMW 1.6.2 |
| 176 | 185 | * @param $outputmode |
| 177 | 186 | * @param $context |
| 178 | 187 | * @param string $format |
| Index: trunk/extensions/SemanticCompoundQueries/SemanticCompoundQueries.php |
| — | — | @@ -17,7 +17,7 @@ |
| 18 | 18 | |
| 19 | 19 | if ( !defined( 'MEDIAWIKI' ) ) die(); |
| 20 | 20 | |
| 21 | | -define( 'SCQ_VERSION', '0.2.9' ); |
| | 21 | +define( 'SCQ_VERSION', '0.2.10 alpha' ); |
| 22 | 22 | |
| 23 | 23 | $wgExtensionCredits[defined( 'SEMANTIC_EXTENSION_TYPE' ) ? 'semantic' : 'parserhook'][] = array( |
| 24 | 24 | 'path' => __FILE__, |