| Index: trunk/extensions/SemanticMediaWiki/specials/QueryPages/SMW_SpecialWantedProperties.php |
| — | — | @@ -64,13 +64,19 @@ |
| 65 | 65 | return '<p>' . wfMsg( 'smw_wantedproperties_docu' ) . "</p><br />\n"; |
| 66 | 66 | } |
| 67 | 67 | |
| | 68 | + /** |
| | 69 | + * @param $skin |
| | 70 | + * @param array $result First item is SMWDIProperty, second item is int |
| | 71 | + * |
| | 72 | + * @return string |
| | 73 | + */ |
| 68 | 74 | function formatResult( $skin, $result ) { |
| 69 | 75 | $linker = smwfGetLinker(); |
| 70 | 76 | |
| 71 | 77 | if ( $result[0]->isUserDefined() ) { |
| 72 | | - $proplink = $linker->makeLinkObj( $result[0]->getWikiPageValue()->getTitle(), htmlspecialchars( $result[0]->getWikiValue() ), 'action=view' ); |
| | 78 | + $proplink = $linker->makeLinkObj( $result[0]->getDiWikiPage()->getTitle(), htmlspecialchars( $result[0]->getLabel() ), 'action=view' ); |
| 73 | 79 | } else { |
| 74 | | - $proplink = $result[0]->getLongHTMLText( $linker ); |
| | 80 | + $proplink = SMWDataValueFactory::newDataItemValue( $result[0], new SMWDIProperty( '_TYPE' ) )->getLongHTMLText( $linker ); |
| 75 | 81 | } |
| 76 | 82 | |
| 77 | 83 | return wfMsgExt( 'smw_wantedproperty_template', array( 'parsemag' ), $proplink, $result[1] ); |
| Index: trunk/extensions/SemanticMediaWiki/includes/storage/SMW_Store.php |
| — | — | @@ -375,7 +375,7 @@ |
| 376 | 376 | * |
| 377 | 377 | * @param SMWRequestOptions $requestoptions |
| 378 | 378 | * |
| 379 | | - * @return array |
| | 379 | + * @return array of array( SMWDIProperty, int ) |
| 380 | 380 | */ |
| 381 | 381 | public abstract function getWantedPropertiesSpecial( $requestoptions = null ); |
| 382 | 382 | |
| Index: trunk/extensions/SemanticMediaWiki/includes/storage/SMW_SQLStore2.php |
| — | — | @@ -1134,7 +1134,7 @@ |
| 1135 | 1135 | * |
| 1136 | 1136 | * @param SMWRequestOptions $requestoptions |
| 1137 | 1137 | * |
| 1138 | | - * @return array |
| | 1138 | + * @return array of array( SMWDIProperty, int ) |
| 1139 | 1139 | */ |
| 1140 | 1140 | public function getWantedPropertiesSpecial( $requestoptions = null ) { |
| 1141 | 1141 | global $smwgPDefaultType; |