| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -492,7 +492,7 @@ |
| 493 | 493 | * for the first message which is non-empty. If all messages are empty then an |
| 494 | 494 | * instance of the first message key is returned. |
| 495 | 495 | * Varargs: message keys |
| 496 | | - * @return \type{Message} |
| | 496 | + * @return Message |
| 497 | 497 | * @since 1.18 |
| 498 | 498 | */ |
| 499 | 499 | function wfMessageFallback( /*...*/ ) { |
| Index: trunk/phase3/includes/LogPage.php |
| — | — | @@ -318,6 +318,14 @@ |
| 319 | 319 | return $rv; |
| 320 | 320 | } |
| 321 | 321 | |
| | 322 | + /** |
| | 323 | + * TODO document |
| | 324 | + * @param $type String |
| | 325 | + * @param $skin Skin |
| | 326 | + * @param $title Title |
| | 327 | + * @param $params Array |
| | 328 | + * @return String |
| | 329 | + */ |
| 322 | 330 | protected static function getTitleLink( $type, $skin, $title, &$params ) { |
| 323 | 331 | global $wgLang, $wgContLang, $wgUserrightsInterwikiDelimiter; |
| 324 | 332 | if( !$skin ) { |
| — | — | @@ -325,7 +333,7 @@ |
| 326 | 334 | } |
| 327 | 335 | switch( $type ) { |
| 328 | 336 | case 'move': |
| 329 | | - $titleLink = $skin->link( |
| | 337 | + $titleLink = Linker::link( |
| 330 | 338 | $title, |
| 331 | 339 | htmlspecialchars( $title->getPrefixedText() ), |
| 332 | 340 | array(), |
| — | — | @@ -336,7 +344,7 @@ |
| 337 | 345 | # Workaround for broken database |
| 338 | 346 | $params[0] = htmlspecialchars( $params[0] ); |
| 339 | 347 | } else { |
| 340 | | - $params[0] = $skin->link( |
| | 348 | + $params[0] = Linker::link( |
| 341 | 349 | $targetTitle, |
| 342 | 350 | htmlspecialchars( $params[0] ) |
| 343 | 351 | ); |
| — | — | @@ -349,8 +357,8 @@ |
| 350 | 358 | // TODO: Store the user identifier in the parameters |
| 351 | 359 | // to make this faster for future log entries |
| 352 | 360 | $id = User::idFromName( $title->getText() ); |
| 353 | | - $titleLink = $skin->userLink( $id, $title->getText() ) |
| 354 | | - . $skin->userToolLinks( $id, $title->getText(), false, Linker::TOOL_LINKS_NOBLOCK ); |
| | 361 | + $titleLink = Linker::userLink( $id, $title->getText() ) |
| | 362 | + . Linker::userToolLinks( $id, $title->getText(), false, Linker::TOOL_LINKS_NOBLOCK ); |
| 355 | 363 | } |
| 356 | 364 | break; |
| 357 | 365 | case 'rights': |
| — | — | @@ -363,16 +371,16 @@ |
| 364 | 372 | break; |
| 365 | 373 | } |
| 366 | 374 | } |
| 367 | | - $titleLink = $skin->link( Title::makeTitle( NS_USER, $text ) ); |
| | 375 | + $titleLink = Linker::link( Title::makeTitle( NS_USER, $text ) ); |
| 368 | 376 | break; |
| 369 | 377 | case 'merge': |
| 370 | | - $titleLink = $skin->link( |
| | 378 | + $titleLink = Linker::link( |
| 371 | 379 | $title, |
| 372 | 380 | $title->getPrefixedText(), |
| 373 | 381 | array(), |
| 374 | 382 | array( 'redirect' => 'no' ) |
| 375 | 383 | ); |
| 376 | | - $params[0] = $skin->link( |
| | 384 | + $params[0] = Linker::link( |
| 377 | 385 | Title::newFromText( $params[0] ), |
| 378 | 386 | htmlspecialchars( $params[0] ) |
| 379 | 387 | ); |
| — | — | @@ -380,15 +388,15 @@ |
| 381 | 389 | break; |
| 382 | 390 | default: |
| 383 | 391 | if( $title->getNamespace() == NS_SPECIAL ) { |
| 384 | | - list( $name, $par ) = SpecialPage::resolveAliasWithSubpage( $title->getDBkey() ); |
| | 392 | + list( $name, $par ) = SpecialPageFactory::resolveAlias( $title->getDBkey() ); |
| 385 | 393 | # Use the language name for log titles, rather than Log/X |
| 386 | 394 | if( $name == 'Log' ) { |
| 387 | | - $titleLink = '(' . $skin->link( $title, LogPage::logName( $par ) ) . ')'; |
| | 395 | + $titleLink = '(' . Linker::link( $title, LogPage::logName( $par ) ) . ')'; |
| 388 | 396 | } else { |
| 389 | | - $titleLink = $skin->link( $title ); |
| | 397 | + $titleLink = Linker::link( $title ); |
| 390 | 398 | } |
| 391 | 399 | } else { |
| 392 | | - $titleLink = $skin->link( $title ); |
| | 400 | + $titleLink = Linker::link( $title ); |
| 393 | 401 | } |
| 394 | 402 | } |
| 395 | 403 | return $titleLink; |