X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=skins%2FStandard.php;h=49a0ad5d2e33b749547886eb88d21f0899beb52b;hb=a42a464e6375bb47f0147f6041253e5d0aab9296;hp=1114e7d0a173230022ce119f46f87ce9e632b52a;hpb=10e91851b2568267e5ccb7bbd0ab24ec4f2a195a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/skins/Standard.php b/skins/Standard.php
index 1114e7d0a1..49a0ad5d2e 100644
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -2,6 +2,22 @@
 /**
  * Standard (a.k.a. Classic) skin: old MediaWiki default skin
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ *
  * @file
  * @ingroup Skins
  */
@@ -62,12 +78,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 +149,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'] )
 					);
@@ -158,34 +174,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 +210,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 +222,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 +284,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;
 	}
-
 }