Index: trunk/extensions/SemanticMediaWiki/includes/storage/SMW_Description.php |
— | — | @@ -216,9 +216,9 @@ |
217 | 217 | public function getQueryString( $asvalue = false ) { |
218 | 218 | $first = true; |
219 | 219 | foreach ( $this->m_diWikiPages as $wikiPage ) { |
220 | | - $wikiValue = SMWDataValueFactory::newFromDataItem( $wikiPage ); |
| 220 | + $wikiValue = SMWDataValueFactory::newDataItemValue( $wikiPage ); |
221 | 221 | if ( $first ) { |
222 | | - $result .= '[[' . $wikiValue->getPrefixedText(); |
| 222 | + $result = '[[' . $wikiValue->getPrefixedText(); |
223 | 223 | $first = false; |
224 | 224 | } else { |
225 | 225 | $result .= '||' . $wikiValue->getText(); |
— | — | @@ -378,7 +378,7 @@ |
379 | 379 | $this->m_comparator = $comparator; |
380 | 380 | } |
381 | 381 | |
382 | | - /// @deprecated Use getDataItem() and SMWDataValueFactory::newFromDataItem() if needed. Vanishes before SMW 1.7 |
| 382 | + /// @deprecated Use getDataItem() and SMWDataValueFactory::newDataItemValue() if needed. Vanishes before SMW 1.7 |
383 | 383 | public function getDataValue() { |
384 | 384 | return $this->m_dataItem; |
385 | 385 | } |
— | — | @@ -393,7 +393,7 @@ |
394 | 394 | |
395 | 395 | public function getQueryString( $asvalue = false ) { |
396 | 396 | $comparator = SMWQueryLanguage::getStringForComparator( $this->m_comparator ); |
397 | | - $dataValue = SMWDataValueFactory::newFromDataItem( $this->m_dataItem ); |
| 397 | + $dataValue = SMWDataValueFactory::newDataItemValue( $this->m_dataItem ); |
398 | 398 | if ( $asvalue ) { |
399 | 399 | return $comparator . $dataValue->getWikiValue(); |
400 | 400 | } else { // this only is possible for values of Type:Page |