From 4ddded2c444706fc92db26087a3765433648ae8a Mon Sep 17 00:00:00 2001
From: umherirrender <umherirrender_de.wp@web.de>
Date: Sat, 27 Apr 2013 12:26:17 +0200
Subject: [PATCH] Split line and fixed spacing in skins folder

Change-Id: I669033b45f34353e201ffe2718ee54fed41fa450
---
 skins/CologneBlue.php |  2 +-
 skins/Modern.php      |  4 ++--
 skins/MonoBook.php    | 11 ++++++-----
 skins/Vector.php      |  3 ++-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index 1669de78bb..0182d762fe 100644
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -532,7 +532,7 @@ class CologneBlueTemplate extends BaseTemplate {
 
 		$search = $this->getSkin()->getRequest()->getText( 'search' );
 		$action = $this->data['searchaction'];
-		$s = "<form id=\"searchform-" . htmlspecialchars($which) . "\" method=\"get\" class=\"inline\" action=\"$action\">";
+		$s = "<form id=\"searchform-" . htmlspecialchars( $which ) . "\" method=\"get\" class=\"inline\" action=\"$action\">";
 		if ( $which == 'footer' ) {
 			$s .= wfMessage( 'qbfind' )->text() . ": ";
 		}
diff --git a/skins/Modern.php b/skins/Modern.php
index 917789514c..52f9fa22b5 100644
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -83,7 +83,7 @@ class ModernTemplate extends MonoBookTemplate {
 	     for the margins -->
 	<div id="mw_contentholder" class="mw-body">
 		<div class='mw-topboxes'>
-			<div id="mw-js-message" style="display:none;"<?php $this->html( 'userlangattributes' )?>></div>
+			<div id="mw-js-message" style="display:none;"<?php $this->html( 'userlangattributes' ) ?>></div>
 			<div class="mw-topbox" id="siteSub"><?php $this->msg( 'tagline' ) ?></div>
 			<?php if ( $this->data['newtalk'] ) {
 				?><div class="usermessage mw-topbox"><?php $this->html( 'newtalk' ) ?></div>
@@ -139,7 +139,7 @@ class ModernTemplate extends MonoBookTemplate {
 <?php
 		foreach ( $this->getFooterLinks( "flat" ) as $aLink ) {
 			if ( isset( $this->data[$aLink] ) && $this->data[$aLink] ) {
-?>				<li id="<?php echo$aLink?>"><?php $this->html($aLink) ?></li>
+?>				<li id="<?php echo $aLink ?>"><?php $this->html( $aLink ) ?></li>
 <?php 		}
 		}
 ?>
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index b704173e61..aeeb0f8091 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -95,7 +95,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 +107,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 +146,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 +159,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 +306,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>
diff --git a/skins/Vector.php b/skins/Vector.php
index 1e4643e06f..0bdf2fb942 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -333,9 +333,10 @@ class VectorTemplate extends BaseTemplate {
 		if ( $msg === null ) {
 			$msg = $name;
 		}
+		$msgObj = wfMessage( $msg );
 		?>
 <div class="portal" role="navigation" id='<?php echo Sanitizer::escapeId( "p-$name" ) ?>'<?php echo Linker::tooltip( 'p-' . $name ) ?>>
-	<h3<?php $this->html( 'userlangattributes' ) ?>><?php $msgObj = wfMessage( $msg ); echo htmlspecialchars( $msgObj->exists() ? $msgObj->text() : $msg ); ?></h3>
+	<h3<?php $this->html( 'userlangattributes' ) ?>><?php echo htmlspecialchars( $msgObj->exists() ? $msgObj->text() : $msg ); ?></h3>
 	<div class="body">
 <?php
 		if ( is_array( $content ) ) { ?>
-- 
2.20.1