From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Tue, 18 May 2010 21:38:06 +0000 (+0000)
Subject: Revert r64426: caused bug 23581 (CollapsibleTabs breakage) for reasons noted in CR... 
X-Git-Tag: 1.31.0-rc.0~36796
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28?a=commitdiff_plain;h=d1d47cdbf87e55dbe0f334844825669c129f502f;p=lhc%2Fweb%2Fwiklou.git

Revert r64426: caused bug 23581 (CollapsibleTabs breakage) for reasons noted in CR comments
---

diff --git a/skins/Vector.php b/skins/Vector.php
index 4d40991b15..cd6a9c9990 100644
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -694,13 +694,11 @@ class VectorTemplate extends QuickTemplate {
 ?>
 <div id="p-namespaces" class="vectorTabs<?php if ( count( $this->data['namespace_urls'] ) == 0 ) echo ' emptyPortlet'; ?>">
 	<h5><?php $this->msg('namespaces') ?></h5>
-	<?php if ( count( $this->data['namespace_urls'] ) ): ?>
 	<ul<?php $this->html('userlangattributes') ?>>
 		<?php foreach ($this->data['namespace_urls'] as $key => $link ): ?>
 			<li <?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><span><?php echo htmlspecialchars( $link['text'] ) ?></span></a></li>
 		<?php endforeach; ?>
 	</ul>
-	<?php endif; ?>
 </div>
 <?php
 				break;
@@ -718,13 +716,11 @@ class VectorTemplate extends QuickTemplate {
 	<?php endif; ?>
 	<h5><span><?php $this->msg('variants') ?></span><a href="#"></a></h5>
 	<div class="menu">
-		<?php if ( count( $this->data['variant_urls'] ) ): ?>
 		<ul<?php $this->html('userlangattributes') ?>>
 			<?php foreach ($this->data['variant_urls'] as $key => $link ): ?>
 				<li<?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
 			<?php endforeach; ?>
 		</ul>
-		<?php endif; ?>
 	</div>
 </div>
 <?php
@@ -733,13 +729,11 @@ class VectorTemplate extends QuickTemplate {
 ?>
 <div id="p-views" class="vectorTabs<?php if ( count( $this->data['view_urls'] ) == 0 ) echo ' emptyPortlet'; ?>">
 	<h5><?php $this->msg('views') ?></h5>
-	<?php if ( count( $this->data['view_urls'] ) ): ?>
 	<ul<?php $this->html('userlangattributes') ?>>
 		<?php foreach ($this->data['view_urls'] as $key => $link ): ?>
 			<li<?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo (array_key_exists('img',$link) ?  '<img src="'.$link['img'].'" alt="'.$link['text'].'" />' : '<span>'.htmlspecialchars( $link['text'] ).'</span>') ?></a></li>
 		<?php endforeach; ?>
 	</ul>
-	<?php endif; ?>
 </div>
 <?php
 				break;
@@ -748,13 +742,11 @@ class VectorTemplate extends QuickTemplate {
 <div id="p-cactions" class="vectorMenu<?php if ( count( $this->data['action_urls'] ) == 0 ) echo ' emptyPortlet'; ?>">
 	<h5><span><?php $this->msg('actions') ?></span><a href="#"></a></h5>
 	<div class="menu">
-		<?php if ( count( $this->data['action_urls'] ) ): ?>
 		<ul<?php $this->html('userlangattributes') ?>>
 			<?php foreach ($this->data['action_urls'] as $key => $link ): ?>
 				<li<?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
 			<?php endforeach; ?>
 		</ul>
-		<?php endif; ?>
 	</div>
 </div>
 <?php
@@ -763,13 +755,11 @@ class VectorTemplate extends QuickTemplate {
 ?>
 <div id="p-personal" class="<?php if ( count( $this->data['personal_urls'] ) == 0 ) echo ' emptyPortlet'; ?>">
 	<h5><?php $this->msg('personaltools') ?></h5>
-	<?php if ( count( $this->data['personal_urls'] ) ): ?>
 	<ul<?php $this->html('userlangattributes') ?>>
 		<?php foreach($this->data['personal_urls'] as $key => $item): ?>
 			<li <?php echo $item['attributes'] ?>><a href="<?php echo htmlspecialchars($item['href']) ?>"<?php echo $item['key'] ?><?php if(!empty($item['class'])): ?> class="<?php echo htmlspecialchars($item['class']) ?>"<?php endif; ?>><?php echo htmlspecialchars($item['text']) ?></a></li>
 		<?php endforeach; ?>
 	</ul>
-	<?php endif; ?>
 </div>
 <?php
 				break;