http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88162
Revision: 88162
Author: mkroetzsch
Date: 2011-05-15 12:32:07 +0000 (Sun, 15 May 2011)
Log Message:
-----------
use methods of SMWDIWikiPage where possible
Modified Paths:
--------------
trunk/extensions/SemanticMediaWiki/includes/datavalues/SMW_DV_WikiPage.php
Modified:
trunk/extensions/SemanticMediaWiki/includes/datavalues/SMW_DV_WikiPage.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/datavalues/SMW_DV_WikiPage.php
2011-05-15 12:25:36 UTC (rev 88161)
+++ trunk/extensions/SemanticMediaWiki/includes/datavalues/SMW_DV_WikiPage.php
2011-05-15 12:32:07 UTC (rev 88162)
@@ -103,7 +103,7 @@
$this->m_fragment =
$this->m_title->getFragment();
$this->m_prefixedtext = '';
$this->m_id = -1; // unset id
- $this->m_dataitem = new SMWDIWikiPage(
$this->m_title->getDBkey(), $this->m_title->getNamespace(),
$this->m_title->getInterwiki(), $this->m_typeid );
+ $this->m_dataitem =
SMWDIWikiPage::newFromTitle( $this->m_title, $this->m_typeid );
}
} else {
smwfLoadExtensionMessages( 'SemanticMediaWiki' );
@@ -369,16 +369,17 @@
* @deprecated Use setDataItem(); it's easy to create an SMWDIWikiPage
from a Title, will vanish before SMW 1.7
*/
public function setTitle( $title ) {
- $diWikiPage = new SMWDIWikiPage( $title->getDBkey(),
$title->getNamespace(), $title->getInterwiki() );
+ $diWikiPage = SMWDIWikiPage::newFromTitle( $title );
$this->setDataItem( $diWikiPage );
- $this->m_title = $title;
+ $this->m_title = $title; // optional, just for efficiency
}
/**
- * @deprecated Use setDBkeys()
+ * @deprecated Use setDataItem()
*/
public function setValues( $dbkey, $namespace, $id = false, $interwiki
= '' ) {
- $this->setDBkeys( array( $dbkey, $namespace, $interwiki, $dbkey
) );
+ $dataItem = new SMWDIWikiPage( $dbkey, $namespace, $interwiki
);
+ $this->setDataItem( $dataItem);
}
/**
@@ -411,9 +412,9 @@
*/
static public function makePageFromTitle( Title $title ) {
$dvWikiPage = new SMWWikiPageValue( '_wpg' );
- $diWikiPage = new SMWDIWikiPage( $title->getDBkey(),
$title->getNamespace(), $title->getInterwiki() );
+ $diWikiPage = SMWDIWikiPage::newFromTitle( $title );
$dvWikiPage->setDataItem( $diWikiPage );
- $dvWikiPage->m_title = $title;
+ $dvWikiPage->m_title = $title; // optional, just for efficiency
return $dvWikiPage;
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
