X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=skins%2FMonoBook.php;h=e805acadbd3e95584f4c6e69e187d11b97b1fd28;hb=02919f75297e8f1e212c5fc11a93323ead45ae23;hp=b704173e61e2f79f31731d7664edc841ec0c2800;hpb=8d6c1cd8feb93b2598c403e67b97f8f5f4138f48;p=lhc%2Fweb%2Fwiklou.git

diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index b704173e61..e805acadbd 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -43,17 +43,10 @@ class SkinMonoBook extends SkinTemplate {
 	 * @param $out OutputPage
 	 */
 	function setupSkinUserCss( OutputPage $out ) {
-		global $wgHandheldStyle;
 		parent::setupSkinUserCss( $out );
 
 		$out->addModuleStyles( 'skins.monobook' );
 
-		// Ugh. Can't do this properly because $wgHandheldStyle may be a URL
-		if ( $wgHandheldStyle ) {
-			// Currently in testing... try 'chick/main.css'
-			$out->addStyle( $wgHandheldStyle, 'handheld' );
-		}
-
 		// TODO: Migrate all of these
 		$out->addStyle( 'monobook/IE60Fixes.css', 'screen', 'IE 6' );
 		$out->addStyle( 'monobook/IE70Fixes.css', 'screen', 'IE 7' );
@@ -95,7 +88,7 @@ class MonoBookTemplate extends BaseTemplate {
 <?php if ( $this->data['undelete'] ) { ?>
 		<div id="contentSub2"><?php $this->html( 'undelete' ) ?></div>
 <?php } ?><?php if ( $this->data['newtalk'] ) { ?>
-		<div class="usermessage"><?php $this->html( 'newtalk' )  ?></div>
+		<div class="usermessage"><?php $this->html( 'newtalk' ) ?></div>
 <?php } ?><?php if ( $this->data['showjumplinks'] ) { ?>
 		<div id="jump-to-nav" class="mw-jump"><?php $this->msg( 'jumpto' ) ?> <a href="#column-one"><?php $this->msg( 'jumptonavigation' ) ?></a><?php $this->msg( 'comma-separator' ) ?><a href="#searchInput"><?php $this->msg( 'jumptosearch' ) ?></a></div>
 <?php } ?>
@@ -107,7 +100,7 @@ class MonoBookTemplate extends BaseTemplate {
 		<div class="visualClear"></div>
 	</div>
 </div></div>
-<div id="column-one"<?php $this->html( 'userlangattributes' )  ?>>
+<div id="column-one"<?php $this->html( 'userlangattributes' ) ?>>
 	<h2><?php $this->msg( 'navigation-heading' ) ?></h2>
 <?php $this->cactions(); ?>
 	<div class="portlet" id="p-personal" role="navigation">
@@ -146,7 +139,7 @@ class MonoBookTemplate extends BaseTemplate {
 		$footerEnd = '';
 	}
 	foreach ( $validFooterIcons as $blockName => $footerIcons ) { ?>
-	<div id="f-<?php echo htmlspecialchars($blockName); ?>ico">
+	<div id="f-<?php echo htmlspecialchars( $blockName ); ?>ico">
 <?php foreach ( $footerIcons as $icon ) { ?>
 		<?php echo $this->getSkin()->makeFooterIcon( $icon ); ?>
 
@@ -159,7 +152,7 @@ class MonoBookTemplate extends BaseTemplate {
 ?>	<ul id="f-list">
 <?php
 			foreach ( $validFooterLinks as $aLink ) { ?>
-		<li id="<?php echo $aLink ?>"><?php $this->html($aLink) ?></li>
+		<li id="<?php echo $aLink ?>"><?php $this->html( $aLink ) ?></li>
 <?php
 			}
 ?>
@@ -306,9 +299,10 @@ echo $footerEnd;
 			$portletAttribs['title'] = $tooltip;
 		}
 		echo '	' . Html::openElement( 'div', $portletAttribs );
+		$msgObj = wfMessage( $bar );
 ?>
 
-		<h3><?php $msg = wfMessage( $bar ); echo htmlspecialchars( $msg->exists() ? $msg->text() : $bar ); ?></h3>
+		<h3><?php echo htmlspecialchars( $msgObj->exists() ? $msgObj->text() : $bar ); ?></h3>
 		<div class='pBody'>
 <?php   if ( is_array( $cont ) ) { ?>
 			<ul>