dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Ensure MWHttpRequest::method gets set with strtoupper() since code examining...
[lhc/web/wiklou.git]
/
includes
/
SkinLegacy.php
diff --git
a/includes/SkinLegacy.php
b/includes/SkinLegacy.php
index
03ae3a4
..
480f3eb
100644
(file)
--- a/
includes/SkinLegacy.php
+++ b/
includes/SkinLegacy.php
@@
-250,7
+250,7
@@
class LegacyTemplate extends BaseTemplate {
}
$s = $wgLang->pipeList( array(
$s,
}
$s = $wgLang->pipeList( array(
$s,
- '<a href="' . htmlspecialchars( $title->getLocalURL( 'variant=' . $code ) ) . '">' . htmlspecialchars( $varname ) . '</a>'
+ '<a href="' . htmlspecialchars( $title->getLocalURL( 'variant=' . $code ) ) . '"
lang="' . $code . '" hreflang="' . $code . '"
>' . htmlspecialchars( $varname ) . '</a>'
) );
}
}
) );
}
}
@@
-324,7
+324,7
@@
class LegacyTemplate extends BaseTemplate {
$s = implode( $element, $sep );
$s = implode( $element, $sep );
- if ( $title->getArticleI
d
() ) {
+ if ( $title->getArticleI
D
() ) {
$s .= "\n<br />";
// Delete/protect/move links for privileged users
$s .= "\n<br />";
// Delete/protect/move links for privileged users
@@
-348,7
+348,7
@@
class LegacyTemplate extends BaseTemplate {
}
function otherLanguages() {
}
function otherLanguages() {
- global $wgOut, $wgLang, $wg
ContLang, $wg
HideInterlanguageLinks;
+ global $wgOut, $wgLang, $wgHideInterlanguageLinks;
if ( $wgHideInterlanguageLinks ) {
return '';
if ( $wgHideInterlanguageLinks ) {
return '';
@@
-375,7
+375,7
@@
class LegacyTemplate extends BaseTemplate {
$first = false;
$nt = Title::newFromText( $l );
$first = false;
$nt = Title::newFromText( $l );
- $text =
$wgContLang->get
LanguageName( $nt->getInterwiki() );
+ $text =
Language::fetch
LanguageName( $nt->getInterwiki() );
$s .= Html::element( 'a',
array( 'href' => $nt->getFullURL(), 'title' => $nt->getText(), 'class' => "external" ),
$s .= Html::element( 'a',
array( 'href' => $nt->getFullURL(), 'title' => $nt->getText(), 'class' => "external" ),
@@
-573,7
+573,7
@@
class LegacyTemplate extends BaseTemplate {
$diff = $wgRequest->getVal( 'diff' );
$title = $this->getSkin()->getTitle();
$diff = $wgRequest->getVal( 'diff' );
$title = $this->getSkin()->getTitle();
- if ( $title->getArticleI
d
() && ( !$diff ) && $wgUser->isAllowed( 'delete' ) ) {
+ if ( $title->getArticleI
D
() && ( !$diff ) && $wgUser->isAllowed( 'delete' ) ) {
$t = wfMsg( 'deletethispage' );
$s = Linker::linkKnown(
$t = wfMsg( 'deletethispage' );
$s = Linker::linkKnown(
@@
-595,7
+595,7
@@
class LegacyTemplate extends BaseTemplate {
$diff = $wgRequest->getVal( 'diff' );
$title = $this->getSkin()->getTitle();
$diff = $wgRequest->getVal( 'diff' );
$title = $this->getSkin()->getTitle();
- if ( $title->getArticleI
d
() && ( ! $diff ) && $wgUser->isAllowed( 'protect' ) ) {
+ if ( $title->getArticleI
D
() && ( ! $diff ) && $wgUser->isAllowed( 'protect' ) ) {
if ( $title->isProtected() ) {
$text = wfMsg( 'unprotectthispage' );
$query = array( 'action' => 'unprotect' );
if ( $title->isProtected() ) {
$text = wfMsg( 'unprotectthispage' );
$query = array( 'action' => 'unprotect' );
@@
-702,7
+702,7
@@
class LegacyTemplate extends BaseTemplate {
global $wgOut;
if ( !$wgOut->isArticleRelated() ) {
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() ),
} else {
return Linker::linkKnown(
SpecialPage::getTitleFor( 'Recentchangeslinked', $this->getSkin()->getTitle()->getPrefixedDBkey() ),
@@
-815,8
+815,9
@@
class LegacyTemplate extends BaseTemplate {
$talkLink = Linker::link( $wgUser->getTalkPage(),
$wgLang->getNsText( NS_TALK ) );
$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' );
}
} else {
$ret .= wfMsg( 'notloggedin' );
}
@@
-837,10
+838,11
@@
class LegacyTemplate extends BaseTemplate {
} else {
$talkLink = Linker::link( $wgUser->getTalkPage(),
$wgLang->getNsText( NS_TALK ) );
} 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 .= Linker::link( $wgUser->getUserPage(),
htmlspecialchars( $wgUser->getName() ) );
- $ret .= "
($talkLink)
<br />";
+ $ret .= "
$talkLink
<br />";
$ret .= $wgLang->pipeList( array(
Linker::link(
SpecialPage::getTitleFor( 'Userlogout' ), wfMsg( 'logout' ),
$ret .= $wgLang->pipeList( array(
Linker::link(
SpecialPage::getTitleFor( 'Userlogout' ), wfMsg( 'logout' ),
@@
-860,6
+862,4
@@
class LegacyTemplate extends BaseTemplate {
return $ret;
}
return $ret;
}
-
}
}
-