| Index: trunk/phase3/skins/Vector.php |
| — | — | @@ -384,7 +384,9 @@ |
| 385 | 385 | if ( $nav[$section][$key]['class'] ) { |
| 386 | 386 | $nav[$section][$key]['attributes'] .= |
| 387 | 387 | ' class="' . htmlspecialchars( $link['class'] ) . '"'; |
| | 388 | + unset( $nav[$section][$key]['class'] ); |
| 388 | 389 | } |
| | 390 | + |
| 389 | 391 | // We don't want to give the watch tab an accesskey if the page is |
| 390 | 392 | // being edited, because that conflicts with the accesskey on the |
| 391 | 393 | // watch checkbox. We also don't want to give the edit tab an |
| — | — | @@ -587,7 +589,7 @@ |
| 588 | 590 | <div class="menu"> |
| 589 | 591 | <ul <?php $this->html('userlangattributes') ?>> |
| 590 | 592 | <?php foreach ($this->data['variant_urls'] as $key => $link ): ?> |
| 591 | | - <li<?php echo $link['attributes'] ?><?php if(!empty($link['class'])): ?> class="<?php echo htmlspecialchars($link['class']) ?>"<?php endif; ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li> |
| | 593 | + <li<?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li> |
| 592 | 594 | <?php endforeach; ?> |
| 593 | 595 | </ul> |
| 594 | 596 | </div> |
| — | — | @@ -602,7 +604,7 @@ |
| 603 | 605 | <h5><?php $this->msg('views') ?></h5> |
| 604 | 606 | <ul <?php $this->html('userlangattributes') ?>> |
| 605 | 607 | <?php foreach ($this->data['view_urls'] as $key => $link ): ?> |
| 606 | | - <li<?php echo $link['attributes'] ?><?php if(!empty($link['class'])): ?> class="<?php echo htmlspecialchars($link['class']) ?>"<?php endif; ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><span><?php echo htmlspecialchars( $link['text'] ) ?></span></a></li> |
| | 608 | + <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> |
| 607 | 609 | <?php endforeach; ?> |
| 608 | 610 | </ul> |
| 609 | 611 | </div> |
| — | — | @@ -615,7 +617,7 @@ |
| 616 | 618 | <div class="menu"> |
| 617 | 619 | <ul <?php $this->html('userlangattributes') ?>> |
| 618 | 620 | <?php foreach ($this->data['action_urls'] as $key => $link ): ?> |
| 619 | | - <li<?php echo $link['attributes'] ?><?php if(!empty($link['class'])): ?> class="<?php echo htmlspecialchars($link['class']) ?>"<?php endif; ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li> |
| | 621 | + <li<?php echo $link['attributes'] ?>><a href="<?php echo htmlspecialchars( $link['href'] ) ?>" <?php echo $link['key'] ?>><?php echo htmlspecialchars( $link['text'] ) ?></a></li> |
| 620 | 622 | <?php endforeach; ?> |
| 621 | 623 | </ul> |
| 622 | 624 | </div> |