r98672 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r98671‎ | r98672 | r98673 >
Date:14:43, 2 October 2011
Author:jeroendedauw
Status:deferred
Tags:
Comment:
fix compar with SMW >=1.6.3
Modified paths:
  • /trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php (modified) (history)

Diff [purge]

Index: trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php
@@ -66,7 +66,9 @@
6767 $query_result = new SCQQueryResult( $next_result->getPrintRequests(), new SMWQuery(), $results, smwfGetStore() );
6868
6969 if ( version_compare( SMW_VERSION, '1.6.1', '>' ) ) {
70 - $other_params = parent::getProcessedParams( $other_params, $next_result->getPrintRequests() );
 70+ $printeouts = $next_result->getPrintRequests();
 71+ SMWQueryProcessor::addThisPrinteout( $printeouts, $other_params );
 72+ $other_params = parent::getProcessedParams( $other_params, $printeouts );
7173 }
7274
7375 return self::getResultFromQueryResult(
@@ -179,6 +181,7 @@
180182 wfProfileIn( 'SCQQueryProcessor::getQueryResultFromQueryString' );
181183
182184 if ( version_compare( SMW_VERSION, '1.6.1', '>' ) ) {
 185+ SMWQueryProcessor::addThisPrinteout( $extraprintouts, $params );
183186 $params = self::getProcessedParams( $params, $extraprintouts, false );
184187 }
185188

Follow-up revisions

RevisionCommit summaryAuthorDate
r98691Added sorting of results, fixed typo in variable name added in r98672yaron17:08, 2 October 2011