http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56294
Revision: 56294
Author: mkroetzsch
Date: 2009-09-14 08:29:45 +0000 (Mon, 14 Sep 2009)
Log Message:
-----------
more suitable handling of invalid page values in getSemanticData
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
2009-09-14 07:27:31 UTC (rev 56293)
+++ trunk/extensions/SemanticMediaWiki/includes/storage/SMW_SQLStore2.php
2009-09-14 08:29:45 UTC (rev 56294)
@@ -116,15 +116,16 @@
wfProfileIn("SMWSQLStore2::getSemanticData (SMW)");
SMWSQLStore2::$in_getSemanticData++;
- if ( $subject instanceof Title ) {
+ if ( $subject instanceof Title ) { ///TODO: can this still
occur?
$sid =
$this->getSMWPageID($subject->getDBkey(),$subject->getNamespace(),$subject->getInterwiki());
$svalue = SMWWikiPageValue::makePageFromTitle($subject);
} elseif ($subject instanceof SMWWikiPageValue) {
- $sid =
$this->getSMWPageID($subject->getDBkey(),$subject->getNamespace(),$subject->getInterwiki());
+ $sid = $subject->isValid()?
+
$this->getSMWPageID($subject->getDBkey(),$subject->getNamespace(),$subject->getInterwiki()):
+ 0;
$svalue = $subject;
} else {
$sid = 0;
- $result = NULL;
}
if ($sid == 0) { // no data, safe our time
/// NOTE: we consider redirects for getting $sid, so
$sid == 0 also means "no redirects"
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
