http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94703
Revision: 94703
Author: yaron
Date: 2011-08-16 22:45:48 +0000 (Tue, 16 Aug 2011)
Log Message:
-----------
Removed support for SMW < 1.5, and removed almost-entirely-unnecessary
wfLoadExtensionMessages() call
Modified Paths:
--------------
trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php
Modified: trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php
===================================================================
--- trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php
2011-08-16 22:42:57 UTC (rev 94702)
+++ trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php
2011-08-16 22:45:48 UTC (rev 94703)
@@ -27,7 +27,6 @@
array_shift( $params ); // We already know the $parser.
$other_params = array();
- $query_result = null;
$results = array();
foreach ( $params as $param ) {
@@ -38,15 +37,7 @@
$sub_params = self::getSubParams(
$param );
$next_result =
self::getQueryResultFromFunctionParams( $sub_params, SMW_OUTPUT_WIKI );
- if ( method_exists( $next_result,
'getResults' ) ) { // SMW 1.5+
- $results =
self::mergeSMWQueryResults( $results, $next_result->getResults() );
- } else {
- if ( $query_result == null ) {
- $query_result = new
SCQQueryResult( $next_result->getPrintRequests(), new SMWQuery() );
- }
-
- $query_result->addResult(
$next_result );
- }
+ $results = self::mergeSMWQueryResults(
$results, $next_result->getResults() );
} else {
$parts = explode( '=', $param, 2 );
@@ -56,14 +47,9 @@
}
}
- // SMW 1.5+
- if ( is_null( $query_result ) ) {
- $query_result = new SCQQueryResult(
$next_result->getPrintRequests(), new SMWQuery(), $results, smwfGetStore() );
- }
-
+ $query_result = new SCQQueryResult(
$next_result->getPrintRequests(), new SMWQuery(), $results, smwfGetStore() );
$result = self::getResultFromQueryResult(
$query_result, $other_params, SMW_OUTPUT_WIKI );
} else {
- wfLoadExtensionMessages( 'SemanticMediaWiki' );
$result = smwfEncodeMessages( array( wfMsgForContent(
'smw_iq_disabled' ) ) );
}
@@ -189,12 +175,8 @@
$display_options[$key] = $value;
}
- if ( method_exists( $query_result, 'getResults' ) ) {
// SMW 1.5+
- foreach ( $query_result->getResults() as
$wiki_page ) {
- $wiki_page->display_options =
$display_options;
- }
- } else {
- $query_result->display_options =
$display_options;
+ foreach ( $query_result->getResults() as $wiki_page ) {
+ $wiki_page->display_options = $display_options;
}
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
