http://www.mediawiki.org/wiki/Special:Code/MediaWiki/98070
Revision: 98070
Author: jeroendedauw
Date: 2011-09-25 17:35:08 +0000 (Sun, 25 Sep 2011)
Log Message:
-----------
fixed bug 97908
Modified Paths:
--------------
trunk/extensions/SemanticMediaWiki/includes/SMW_QueryProcessor.php
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_QueryProcessor.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/SMW_QueryProcessor.php
2011-09-25 17:26:33 UTC (rev 98069)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_QueryProcessor.php
2011-09-25 17:35:08 UTC (rev 98070)
@@ -187,21 +187,18 @@
}
/**
+ * Add the subject print request, unless mainlabel is set to "-".
*
- *
- * FIXME: show queries are not getting any results w/o passing any
query condition
- *
* @since 1.6.3
*
* @param array $printRequests
* @param array $rawParams
- * @param boolean $isShow
*/
- public static function addThisPrinteout( array &$printRequests, array
$rawParams, $isShow = false ) {
- if ( !$isShow && !is_null( $printRequests ) ) {
+ public static function addThisPrinteout( array &$printRequests, array
$rawParams ) {
+ if ( !is_null( $printRequests ) ) {
$hasMainlabel = array_key_exists( 'mainlabel',
$rawParams );
- if ( !$hasMainlabel || $rawParams['mainlabel'] === '-'
) {
+ if ( !$hasMainlabel || $rawParams['mainlabel'] !== '-'
) {
array_unshift( $printRequests, new
SMWPrintRequest(
SMWPrintRequest::PRINT_THIS,
$hasMainlabel ? $rawParams['mainlabel']
: ''
@@ -325,8 +322,13 @@
*/
static public function getResultFromFunctionParams( array $rawparams,
$outputmode, $context = self::INLINE_QUERY, $showmode = false ) {
self::processFunctionParams( $rawparams, $querystring, $params,
$printouts, $showmode );
- self::addThisPrinteout( $printouts, $params, $showmode );
+
+ if ( !$showmode ) {
+ self::addThisPrinteout( $printouts, $params, $showmode
);
+ }
+
$params = self::getProcessedParams( $params, $printouts );
+
return self::getResultFromQueryString( $querystring, $params,
$printouts, SMW_OUTPUT_WIKI, $context );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
