X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSkinLegacy.php;h=63852505f51f3026e90e1b55860b309c4c35c297;hb=4dd5bf200838679b6a1bf4b1b5e7e4a521cb07bd;hp=53273fb5b725dfb4a8bd7c80ab9ff8d5f87bfd20;hpb=a8538c7d58ac75955329ffbbca5ff81aba7bd50e;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/SkinLegacy.php b/includes/SkinLegacy.php index 53273fb5b7..63852505f5 100644 --- a/includes/SkinLegacy.php +++ b/includes/SkinLegacy.php @@ -1,12 +1,25 @@ tag. Split into + * This will be called immediately after the "" tag. Split into * two functions to make it easier to subclass. + * @return string */ function beforeContent() { return $this->doBeforeContent(); @@ -145,14 +159,16 @@ class LegacyTemplate extends BaseTemplate { } /** - * This gets called shortly before the tag. - * @return String HTML to be put before + * This gets called shortly before the "" tag. + * @return String HTML to be put before "" */ function afterContent() { return $this->doAfterContent(); } - /** overloaded by derived classes */ + /** overloaded by derived classes + * @return string + */ function doAfterContent() { return ''; } @@ -238,7 +254,7 @@ class LegacyTemplate extends BaseTemplate { $variants = $lang->getVariants(); if ( !$wgDisableLangConversion && sizeof( $variants ) > 1 - && $title->getNamespace() != NS_SPECIAL ) { + && !$title->isSpecialPage() ) { foreach ( $variants as $code ) { $varname = $lang->getVariantname( $code ); @@ -247,7 +263,7 @@ class LegacyTemplate extends BaseTemplate { } $s = $wgLang->pipeList( array( $s, - '' . htmlspecialchars( $varname ) . '' + '' . htmlspecialchars( $varname ) . '' ) ); } } @@ -284,7 +300,7 @@ class LegacyTemplate extends BaseTemplate { } function bottomLinks() { - global $wgOut, $wgUser, $wgUseTrackbacks; + global $wgOut, $wgUser; $sep = wfMsgExt( 'pipe-separator', 'escapenoentities' ) . "\n"; $s = ''; @@ -300,10 +316,6 @@ class LegacyTemplate extends BaseTemplate { $element[] = $this->whatLinksHere(); $element[] = $this->watchPageLinksLink(); - if ( $wgUseTrackbacks ) { - $element[] = $this->trackbackLink(); - } - $title = $this->getSkin()->getTitle(); if ( @@ -325,7 +337,7 @@ class LegacyTemplate extends BaseTemplate { $s = implode( $element, $sep ); - if ( $title->getArticleId() ) { + if ( $title->getArticleID() ) { $s .= "\n
"; // Delete/protect/move links for privileged users @@ -349,7 +361,7 @@ class LegacyTemplate extends BaseTemplate { } function otherLanguages() { - global $wgOut, $wgContLang, $wgHideInterlanguageLinks; + global $wgOut, $wgLang, $wgHideInterlanguageLinks; if ( $wgHideInterlanguageLinks ) { return ''; @@ -364,8 +376,8 @@ class LegacyTemplate extends BaseTemplate { $s = wfMsg( 'otherlanguages' ) . wfMsg( 'colon-separator' ); $first = true; - if ( $wgContLang->isRTL() ) { - $s .= ''; + if ( $wgLang->isRTL() ) { + $s .= ''; } foreach ( $a as $l ) { @@ -376,14 +388,14 @@ class LegacyTemplate extends BaseTemplate { $first = false; $nt = Title::newFromText( $l ); - $text = $wgContLang->getLanguageName( $nt->getInterwiki() ); + $text = Language::fetchLanguageName( $nt->getInterwiki() ); $s .= Html::element( 'a', array( 'href' => $nt->getFullURL(), 'title' => $nt->getText(), 'class' => "external" ), $text == '' ? $l : $text ); } - if ( $wgContLang->isRTL() ) { + if ( $wgLang->isRTL() ) { $s .= ''; } @@ -392,6 +404,7 @@ class LegacyTemplate extends BaseTemplate { /** * Show a drop-down box of special pages + * @return string */ function specialPagesList() { global $wgScript; @@ -490,7 +503,7 @@ class LegacyTemplate extends BaseTemplate { */ function pageTitle() { global $wgOut; - $s = '

' . $wgOut->getPageTitle() . '

'; + $s = '

' . $wgOut->getPageTitle() . '

'; return $s; } @@ -534,8 +547,10 @@ class LegacyTemplate extends BaseTemplate { /** * @deprecated in 1.19 + * @return string */ function getQuickbarCompensator( $rows = 1 ) { + wfDeprecated( __METHOD__, '1.19' ); return " "; } @@ -571,7 +586,7 @@ class LegacyTemplate extends BaseTemplate { $diff = $wgRequest->getVal( 'diff' ); $title = $this->getSkin()->getTitle(); - if ( $title->getArticleId() && ( !$diff ) && $wgUser->isAllowed( 'delete' ) ) { + if ( $title->getArticleID() && ( !$diff ) && $wgUser->isAllowed( 'delete' ) ) { $t = wfMsg( 'deletethispage' ); $s = Linker::linkKnown( @@ -593,7 +608,7 @@ class LegacyTemplate extends BaseTemplate { $diff = $wgRequest->getVal( 'diff' ); $title = $this->getSkin()->getTitle(); - if ( $title->getArticleId() && ( ! $diff ) && $wgUser->isAllowed( 'protect' ) ) { + if ( $title->getArticleID() && ( ! $diff ) && $wgUser->isAllowed( 'protect' ) ) { if ( $title->isProtected() ) { $text = wfMsg( 'unprotectthispage' ); $query = array( 'action' => 'unprotect' ); @@ -623,7 +638,7 @@ class LegacyTemplate extends BaseTemplate { $title = $this->getSkin()->getTitle(); if ( $wgOut->isArticleRelated() ) { - if ( $title->userIsWatching() ) { + if ( $wgUser->isWatched( $title ) ) { $text = wfMsg( 'unwatchthispage' ); $query = array( 'action' => 'unwatch', @@ -700,7 +715,7 @@ class LegacyTemplate extends BaseTemplate { global $wgOut; if ( !$wgOut->isArticleRelated() ) { - return '(' . wfMsg( 'notanarticle' ) . ')'; + return wfMessage( 'parentheses', wfMessage( 'notanarticle' )->text() )->escaped(); } else { return Linker::linkKnown( SpecialPage::getTitleFor( 'Recentchangeslinked', $this->getSkin()->getTitle()->getPrefixedDBkey() ), @@ -709,11 +724,6 @@ class LegacyTemplate extends BaseTemplate { } } - function trackbackLink() { - return '' - . wfMsg( 'trackbacklink' ) . ''; - } - function talkLink() { $title = $this->getSkin()->getTitle(); if ( NS_SPECIAL == $title->getNamespace() ) { @@ -770,7 +780,7 @@ class LegacyTemplate extends BaseTemplate { global $wgOut; $title = $this->getSkin()->getTitle(); - if ( $title->getNamespace() == NS_SPECIAL ) { + if ( $title->isSpecialPage() ) { return ''; } @@ -818,8 +828,9 @@ class LegacyTemplate extends BaseTemplate { $talkLink = Linker::link( $wgUser->getTalkPage(), $wgLang->getNsText( NS_TALK ) ); + $talkLink = wfMessage( 'parentheses' )->rawParams( $talkLink )->escaped(); - $ret .= "$name ($talkLink)"; + $ret .= "$name $talkLink"; } else { $ret .= wfMsg( 'notloggedin' ); } @@ -840,10 +851,11 @@ class LegacyTemplate extends BaseTemplate { } else { $talkLink = Linker::link( $wgUser->getTalkPage(), $wgLang->getNsText( NS_TALK ) ); + $talkLink = wfMessage( 'parentheses' )->rawParams( $talkLink )->escaped(); $ret .= Linker::link( $wgUser->getUserPage(), htmlspecialchars( $wgUser->getName() ) ); - $ret .= " ($talkLink)
"; + $ret .= " $talkLink
"; $ret .= $wgLang->pipeList( array( Linker::link( SpecialPage::getTitleFor( 'Userlogout' ), wfMsg( 'logout' ), @@ -863,6 +875,4 @@ class LegacyTemplate extends BaseTemplate { return $ret; } - } -