summaryrefslogtreecommitdiff
path: root/skins/Standard.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2013-01-18 16:46:04 +0100
committerPierre Schmitz <pierre@archlinux.de>2013-01-18 16:46:04 +0100
commit63601400e476c6cf43d985f3e7b9864681695ed4 (patch)
treef7846203a952e38aaf66989d0a4702779f549962 /skins/Standard.php
parent8ff01378c9e0207f9169b81966a51def645b6a51 (diff)
Update to MediaWiki 1.20.2
this update includes: * adjusted Arch Linux skin * updated FluxBBAuthPlugin * patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024
Diffstat (limited to 'skins/Standard.php')
-rw-r--r--skins/Standard.php37
1 files changed, 18 insertions, 19 deletions
diff --git a/skins/Standard.php b/skins/Standard.php
index bd0c41a5..de116391 100644
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -62,12 +62,12 @@ class StandardTemplate extends LegacyTemplate {
$s = "\n</div><br style=\"clear:both\" />\n";
$s .= "\n<div id='footer'>";
- $s .= '<table border="0" cellspacing="0"><tr>';
+ $s .= '<table cellspacing="0"><tr>';
wfProfileOut( __METHOD__ . '-1' );
wfProfileIn( __METHOD__ . '-2' );
$l = $this->getSkin()->getLanguage()->alignStart();
- $s .= "<td class='bottom' align='$l' valign='top'>";
+ $s .= "<td class='bottom' style='text-align: $l; vertical-align: top;'>";
$s .= $this->bottomLinks();
$s .= "\n<br />" . $this->getSkin()->getLanguage()->pipeList( array(
@@ -133,7 +133,7 @@ class StandardTemplate extends LegacyTemplate {
$s.= Linker::specialLink( 'Watchlist' ) ;
$s .= $sep . Linker::linkKnown(
SpecialPage::getTitleFor( 'Contributions' ),
- wfMsg( 'mycontris' ),
+ wfMessage( 'mycontris' )->escaped(),
array(),
array( 'target' => $this->data['username'] )
);
@@ -143,7 +143,7 @@ class StandardTemplate extends LegacyTemplate {
}
$s .= "\n<hr class='sep' />";
- $articleExists = $title->getArticleId();
+ $articleExists = $title->getArticleID();
if ( $this->data['isarticle'] || $action == 'edit' || $action == 'history' || $wpPreview ) {
if( $this->data['isarticle'] ) {
$s .= '<strong>' . $this->editThisPage() . '</strong>';
@@ -158,34 +158,34 @@ class StandardTemplate extends LegacyTemplate {
case NS_TEMPLATE_TALK:
case NS_HELP_TALK:
case NS_CATEGORY_TALK:
- $text = wfMsg('viewtalkpage');
+ $text = wfMessage('viewtalkpage');
break;
case NS_MAIN:
- $text = wfMsg( 'articlepage' );
+ $text = wfMessage( 'articlepage' );
break;
case NS_USER:
- $text = wfMsg( 'userpage' );
+ $text = wfMessage( 'userpage' );
break;
case NS_PROJECT:
- $text = wfMsg( 'projectpage' );
+ $text = wfMessage( 'projectpage' );
break;
case NS_FILE:
- $text = wfMsg( 'imagepage' );
+ $text = wfMessage( 'imagepage' );
break;
case NS_MEDIAWIKI:
- $text = wfMsg( 'mediawikipage' );
+ $text = wfMessage( 'mediawikipage' );
break;
case NS_TEMPLATE:
- $text = wfMsg( 'templatepage' );
+ $text = wfMessage( 'templatepage' );
break;
case NS_HELP:
- $text = wfMsg( 'viewhelppage' );
+ $text = wfMessage( 'viewhelppage' );
break;
case NS_CATEGORY:
- $text = wfMsg( 'categorypage' );
+ $text = wfMessage( 'categorypage' );
break;
default:
- $text = wfMsg( 'articlepage' );
+ $text = wfMessage( 'articlepage' );
}
$link = $title->getText();
@@ -194,11 +194,11 @@ class StandardTemplate extends LegacyTemplate {
$link = $nstext . ':' . $link;
}
- $s .= Linker::link( Title::newFromText( $link ), $text );
+ $s .= Linker::link( Title::newFromText( $link ), $text->escaped() );
} elseif( $title->getNamespace() != NS_SPECIAL ) {
# we just throw in a "New page" text to tell the user that he's in edit mode,
# and to avoid messing with the separator that is prepended to the next item
- $s .= '<strong>' . wfMsg( 'newpage' ) . '</strong>';
+ $s .= '<strong>' . wfMessage( 'newpage' )->escaped() . '</strong>';
}
}
@@ -206,7 +206,7 @@ class StandardTemplate extends LegacyTemplate {
if( ( $title->isTalkPage() || $this->getSkin()->getOutput()->showNewSectionLink() ) && $action != 'edit' && !$wpPreview )
$s .= '<br />' . Linker::link(
$title,
- wfMsg( 'postcomment' ),
+ wfMessage( 'postcomment' )->escaped(),
array(),
array(
'action' => 'edit',
@@ -268,12 +268,11 @@ class StandardTemplate extends LegacyTemplate {
global $wgSiteSupportPage;
if( $wgSiteSupportPage ) {
$s .= "\n<br /><a href=\"" . htmlspecialchars( $wgSiteSupportPage ) .
- '" class="internal">' . wfMsg( 'sitesupport' ) . '</a>';
+ '" class="internal">' . wfMessage( 'sitesupport' )->escaped() . '</a>';
}
$s .= "\n<br /></div>\n";
wfProfileOut( __METHOD__ );
return $s;
}
-
}