r66628 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r66627‎ | r66628 | r66629 >
Date:21:38, 18 May 2010
Author:catrope
Status:ok
Tags:
Comment:
Revert r64426: caused bug 23581 (CollapsibleTabs breakage) for reasons noted in CR comments
Modified paths:
  • /trunk/phase3/skins/Vector.php (modified) (history)

Diff [purge]

Index: trunk/phase3/skins/Vector.php
@@ -694,13 +694,11 @@
695695 ?>
696696 <div id="p-namespaces" class="vectorTabs<?php if ( count( $this->data['namespace_urls'] ) == 0 ) echo ' emptyPortlet'; ?>">
697697 <h5><?php $this->msg('namespaces') ?></h5>
698 - <?php if ( count( $this->data['namespace_urls'] ) ): ?>
699698 <ul<?php $this->html('userlangattributes') ?>>
700699 <?php foreach ($this->data['namespace_urls'] as $key => $link ): ?>
701700 <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>
702701 <?php endforeach; ?>
703702 </ul>
704 - <?php endif; ?>
705703 </div>
706704 <?php
707705 break;
@@ -718,13 +716,11 @@
719717 <?php endif; ?>
720718 <h5><span><?php $this->msg('variants') ?></span><a href="#"></a></h5>
721719 <div class="menu">
722 - <?php if ( count( $this->data['variant_urls'] ) ): ?>
723720 <ul<?php $this->html('userlangattributes') ?>>
724721 <?php foreach ($this->data['variant_urls'] as $key => $link ): ?>
725722 <li<?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
726723 <?php endforeach; ?>
727724 </ul>
728 - <?php endif; ?>
729725 </div>
730726 </div>
731727 <?php
@@ -733,13 +729,11 @@
734730 ?>
735731 <div id="p-views" class="vectorTabs<?php if ( count( $this->data['view_urls'] ) == 0 ) echo ' emptyPortlet'; ?>">
736732 <h5><?php $this->msg('views') ?></h5>
737 - <?php if ( count( $this->data['view_urls'] ) ): ?>
738733 <ul<?php $this->html('userlangattributes') ?>>
739734 <?php foreach ($this->data['view_urls'] as $key => $link ): ?>
740735 <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>
741736 <?php endforeach; ?>
742737 </ul>
743 - <?php endif; ?>
744738 </div>
745739 <?php
746740 break;
@@ -748,13 +742,11 @@
749743 <div id="p-cactions" class="vectorMenu<?php if ( count( $this->data['action_urls'] ) == 0 ) echo ' emptyPortlet'; ?>">
750744 <h5><span><?php $this->msg('actions') ?></span><a href="#"></a></h5>
751745 <div class="menu">
752 - <?php if ( count( $this->data['action_urls'] ) ): ?>
753746 <ul<?php $this->html('userlangattributes') ?>>
754747 <?php foreach ($this->data['action_urls'] as $key => $link ): ?>
755748 <li<?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li>
756749 <?php endforeach; ?>
757750 </ul>
758 - <?php endif; ?>
759751 </div>
760752 </div>
761753 <?php
@@ -763,13 +755,11 @@
764756 ?>
765757 <div id="p-personal" class="<?php if ( count( $this->data['personal_urls'] ) == 0 ) echo ' emptyPortlet'; ?>">
766758 <h5><?php $this->msg('personaltools') ?></h5>
767 - <?php if ( count( $this->data['personal_urls'] ) ): ?>
768759 <ul<?php $this->html('userlangattributes') ?>>
769760 <?php foreach($this->data['personal_urls'] as $key => $item): ?>
770761 <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>
771762 <?php endforeach; ?>
772763 </ul>
773 - <?php endif; ?>
774764 </div>
775765 <?php
776766 break;

Follow-up revisions

RevisionCommit summaryAuthorDate
r67921Revert r67799, per CR (it did the same thing as r64426, which was reverted in...catrope21:04, 12 June 2010

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r64426Ensures empty UL elements are never included in output by testing if menus ha...tparscal06:48, 31 March 2010

Status & tagging log