| Index: trunk/extensions/SemanticMediaWiki/specials/SearchTriple/SMW_SpecialBrowse.php |
| — | — | @@ -198,6 +198,7 @@ |
| 199 | 199 | * @param[in] $property SMWPropertyValue The property this value is linked to the subject with |
| 200 | 200 | * @param[in] $value SMWDataValue The actual value |
| 201 | 201 | * @param[in] $incoming bool If this is an incoming or outgoing link |
| | 202 | + * |
| 202 | 203 | * @return string HTML with the link to the article, browse, and search pages |
| 203 | 204 | */ |
| 204 | 205 | private function displayValue( SMWPropertyValue $property, SMWDataValue $dataValue, $incoming ) { |
| — | — | @@ -208,7 +209,7 @@ |
| 209 | 210 | if ( $dataValue->getTypeID() == '_wpg' ) { |
| 210 | 211 | $html .= " " . SMWInfolink::newBrowsingLink( '+', $dataValue->getLongWikiText() )->getHTML( $linker ); |
| 211 | 212 | } elseif ( $incoming && $property->isVisible() ) { |
| 212 | | - $html .= " " . SMWInfolink::newInversePropertySearchLink( '+', $dataValue->getTitle(), $property->getText(), 'smwsearch' )->getHTML( $linker ); |
| | 213 | + $html .= " " . SMWInfolink::newInversePropertySearchLink( '+', $dataValue->getTitle(), $property->getDataItem()->getLabel(), 'smwsearch' )->getHTML( $linker ); |
| 213 | 214 | } else { |
| 214 | 215 | $html .= $dataValue->getInfolinkText( SMW_OUTPUT_HTML, $linker ); |
| 215 | 216 | } |
| Index: trunk/extensions/SemanticMediaWiki/specials/SearchTriple/SMW_SpecialPageProperty.php |
| — | — | @@ -121,19 +121,25 @@ |
| 122 | 122 | } else { |
| 123 | 123 | $html .= "<ul>\n"; |
| 124 | 124 | $count = $limit + 1; |
| | 125 | + |
| 125 | 126 | foreach ( $results as $di ) { |
| 126 | 127 | $count--; |
| 127 | 128 | if ( $count < 1 ) continue; |
| | 129 | + |
| 128 | 130 | $dv = SMWDataValueFactory::newDataItemValue( $di, $property->getDataItem() ); |
| 129 | 131 | $html .= '<li>' . $dv->getLongHTMLText( $linker ); // do not show infolinks, the magnifier "+" is ambiguous with the browsing '+' for '_wpg' (see below) |
| | 132 | + |
| 130 | 133 | if ( $property->getDataItem()->findPropertyTypeID() == '_wpg' ) { |
| 131 | 134 | $browselink = SMWInfolink::newBrowsingLink( '+', $dv->getLongWikiText() ); |
| 132 | 135 | $html .= '  ' . $browselink->getHTML( $linker ); |
| 133 | 136 | } |
| | 137 | + |
| 134 | 138 | $html .= "</li> \n"; |
| 135 | 139 | } |
| | 140 | + |
| 136 | 141 | $html .= "</ul>\n"; |
| 137 | 142 | } |
| | 143 | + |
| 138 | 144 | $html .= $navigation; |
| 139 | 145 | } |
| 140 | 146 | |
| Index: trunk/extensions/SemanticMediaWiki/includes/datavalues/SMW_DV_Property.php |
| — | — | @@ -260,6 +260,7 @@ |
| 261 | 261 | * A function for registering/overwriting predefined properties for SMW. Should be called from |
| 262 | 262 | * within the hook 'smwInitProperties'. Ids should start with three underscores "___" to avoid |
| 263 | 263 | * current and future confusion with SMW built-ins. |
| | 264 | + * |
| 264 | 265 | * @deprecated Use SMWDIProperty::registerProperty(). Will vanish before SMW 1.7. |
| 265 | 266 | */ |
| 266 | 267 | static public function registerProperty( $id, $typeid, $label = false, $show = false ) { |
| — | — | @@ -270,6 +271,7 @@ |
| 271 | 272 | * Add a new alias label to an existing datatype id. Note that every ID should have a primary |
| 272 | 273 | * label, either provided by SMW or registered with registerDatatype. This function should be |
| 273 | 274 | * called from within the hook 'smwInitDatatypes'. |
| | 275 | + * |
| 274 | 276 | * @deprecated Use SMWDIProperty::registerPropertyAlias(). Will vanish before SMW 1.7. |
| 275 | 277 | */ |
| 276 | 278 | static public function registerPropertyAlias( $id, $label ) { |
| — | — | @@ -278,7 +280,8 @@ |
| 279 | 281 | |
| 280 | 282 | /** |
| 281 | 283 | * @see SMWDIProperty::isUserDefined() |
| 282 | | - * @deprecated |
| | 284 | + * |
| | 285 | + * @deprecated since 1.6 |
| 283 | 286 | */ |
| 284 | 287 | public function isUserDefined() { |
| 285 | 288 | return $this->m_dataitem->isUserDefined(); |
| — | — | @@ -286,7 +289,8 @@ |
| 287 | 290 | |
| 288 | 291 | /** |
| 289 | 292 | * @see SMWDIProperty::isShown() |
| 290 | | - * @deprecated |
| | 293 | + * |
| | 294 | + * @deprecated since 1.6 |
| 291 | 295 | */ |
| 292 | 296 | public function isShown() { |
| 293 | 297 | return $this->m_dataitem->isShown(); |
| — | — | @@ -294,7 +298,8 @@ |
| 295 | 299 | |
| 296 | 300 | /** |
| 297 | 301 | * @see SMWDIProperty::isInverse() |
| 298 | | - * @deprecated |
| | 302 | + * |
| | 303 | + * @deprecated since 1.6 |
| 299 | 304 | */ |
| 300 | 305 | public function isInverse() { |
| 301 | 306 | return $this->m_dataitem->isInverse(); |
| — | — | @@ -305,7 +310,8 @@ |
| 306 | 311 | * for internal (invisible) properties, it is the property ID. The value agrees |
| 307 | 312 | * with the first component of getDBkeys() and it can be used in its place. |
| 308 | 313 | * @see SMWDIProperty::getKey() |
| 309 | | - * @deprecated |
| | 314 | + * |
| | 315 | + * @deprecated since 1.6 |
| 310 | 316 | */ |
| 311 | 317 | public function getDBkey() { |
| 312 | 318 | return $this->m_dataitem->getKey(); |
| — | — | @@ -313,7 +319,8 @@ |
| 314 | 320 | |
| 315 | 321 | /** |
| 316 | 322 | * @see SMWDIProperty::getLabel() |
| 317 | | - * @deprecated |
| | 323 | + * |
| | 324 | + * @deprecated since 1.6 |
| 318 | 325 | */ |
| 319 | 326 | public function getText() { |
| 320 | 327 | return $this->m_dataitem->getLabel(); |