http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97736
Revision: 97736
Author: jeroendedauw
Date: 2011-09-21 14:35:11 +0000 (Wed, 21 Sep 2011)
Log Message:
-----------
inceremnting to 1.6.3 alpha; small fixes
Modified Paths:
--------------
trunk/extensions/SemanticMediaWiki/includes/SMW_QueryProcessor.php
trunk/extensions/SemanticMediaWiki/includes/SMW_Setup.php
trunk/extensions/SemanticMediaWiki/includes/SMW_SetupLight.php
trunk/extensions/SemanticMediaWiki/includes/params/SMW_ParamFormat.php
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_QueryProcessor.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/SMW_QueryProcessor.php
2011-09-21 14:29:26 UTC (rev 97735)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_QueryProcessor.php
2011-09-21 14:35:11 UTC (rev 97736)
@@ -37,6 +37,13 @@
* @return array
*/
public static function getProcessedParams( array $params, array
$printRequests = null, $unknownInvalid = true ) {
+// $mainlabel = array_key_exists( 'mainlabel', $params ) ?
$params['mainlabel'] : '';
+// if ( ( $querymode == SMWQuery::MODE_NONE ) ||
+// ( ( !$desc->isSingleton() || ( count(
$desc->getPrintRequests() ) + count( $extraprintouts ) == 0 ) )
+// && ( trim( $mainlabel ) != '-' ) ) ) {
+// $desc->prependPrintRequest( new SMWPrintRequest(
SMWPrintRequest::PRINT_THIS, $mainlabel ) );
+// }
+
$paramDefinitions = self::getParameters();
$formatManipulation = new SMWParamFormat();
@@ -95,17 +102,10 @@
$querymode = $printer->getQueryMode( $context );
}
- $mainlabel = array_key_exists( 'mainlabel', $params ) ?
$params['mainlabel'] : '';
- if ( ( $querymode == SMWQuery::MODE_NONE ) ||
- ( ( !$desc->isSingleton() || ( count(
$desc->getPrintRequests() ) + count( $extraprintouts ) == 0 ) )
- && ( trim( $mainlabel ) != '-' ) ) ) {
- $desc->prependPrintRequest( new SMWPrintRequest(
SMWPrintRequest::PRINT_THIS, $mainlabel ) );
- }
-
$query = new SMWQuery( $desc, ( $context != self::SPECIAL_PAGE
), ( $context == self::CONCEPT_DESC ) );
$query->setQueryString( $querystring );
$query->setExtraPrintouts( $extraprintouts );
- $query->setMainLabel( $mainlabel );
+ $query->setMainLabel( $params['mainlabel'] );
$query->addErrors( $qp->getErrors() ); // keep parsing errors
for later output
// set mode, limit, and offset:
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_Setup.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/SMW_Setup.php 2011-09-21
14:29:26 UTC (rev 97735)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_Setup.php 2011-09-21
14:35:11 UTC (rev 97736)
@@ -8,7 +8,7 @@
*/
// The SMW version number.
-define( 'SMW_VERSION', '1.6.2' );
+define( 'SMW_VERSION', '1.6.2.1 alpha' );
// A flag used to indicate SMW defines a semantic extension type for extension
crdits.
define( 'SEMANTIC_EXTENSION_TYPE', true );
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_SetupLight.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/SMW_SetupLight.php
2011-09-21 14:29:26 UTC (rev 97735)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_SetupLight.php
2011-09-21 14:35:11 UTC (rev 97736)
@@ -14,7 +14,7 @@
* @ingroup SMW
*/
-define( 'SMW_VERSION', '1.6.2 light' );
+define( 'SMW_VERSION', '1.6.2.1 alpha light' );
require_once( 'SMW_GlobalFunctions.php' );
Modified: trunk/extensions/SemanticMediaWiki/includes/params/SMW_ParamFormat.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/params/SMW_ParamFormat.php
2011-09-21 14:29:26 UTC (rev 97735)
+++ trunk/extensions/SemanticMediaWiki/includes/params/SMW_ParamFormat.php
2011-09-21 14:35:11 UTC (rev 97736)
@@ -126,7 +126,7 @@
// If no default was set by an extension, use a table
or list, depending on the column count.
if ( $format === false ) {
- $format = count( $this->printRequests ) == 0 ?
'list' : 'table';
+ $format = count( $this->printRequests ) == 1 ?
'list' : 'table';
}
return $format;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
