http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71237
Revision: 71237
Author: yaron
Date: 2010-08-18 02:52:32 +0000 (Wed, 18 Aug 2010)
Log Message:
-----------
Fixed PHP error
Modified Paths:
--------------
trunk/extensions/SemanticMediaWiki/includes/storage/SMW_SQLStore2.php
Modified: trunk/extensions/SemanticMediaWiki/includes/storage/SMW_SQLStore2.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/storage/SMW_SQLStore2.php
2010-08-18 02:50:52 UTC (rev 71236)
+++ trunk/extensions/SemanticMediaWiki/includes/storage/SMW_SQLStore2.php
2010-08-18 02:52:32 UTC (rev 71237)
@@ -1005,8 +1005,10 @@
$query = '(' . implode( ') UNION (', $queries ) . ') ORDER BY
smw_sortkey';
// The following line is possible in MW 1.6 and above only:
// $query = $db->unionQueries($queries, false) . ' ORDER BY
smw_sortkey'; // should probably use $db->makeSelectOptions()
- if ( $requestoptions->limit > 0 ) {
- $query = $db->limitResult( $query,
$requestoptions->limit, ( $requestoptions->offset > 0 ) ?
$requestoptions->offset:0 );
+ if ( $requestoptions !== null ) {
+ if ( $requestoptions->limit > 0 ) {
+ $query = $db->limitResult( $query,
$requestoptions->limit, ( $requestoptions->offset > 0 ) ?
$requestoptions->offset:0 );
+ }
}
$res = $db->query( $query, 'SMW::getPropertySubjects' );
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
