From: Daniel Friesen <dantman@users.mediawiki.org>
Date: Sat, 1 Jan 2011 16:44:58 +0000 (+0000)
Subject: Fix modern to use the tooltiponly attribute.
X-Git-Tag: 1.31.0-rc.0~32924
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=3332443230af38725f893e989b88c0b45419d7c6;p=lhc%2Fweb%2Fwiklou.git

Fix modern to use the tooltiponly attribute.
---

diff --git a/skins/Modern.php b/skins/Modern.php
index d54bc41fb8..1871adfb81 100644
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -72,14 +72,7 @@ class ModernTemplate extends MonoBookTemplate {
 						echo ' class="'.htmlspecialchars($tab['class']).'"';
 					}
 					echo'><a href="'.htmlspecialchars($tab['href']).'"';
-					# We don't want to give the watch tab an accesskey if the
-					# page is being edited, because that conflicts with the
-					# accesskey on the watch checkbox.  We also don't want to
-					# give the edit tab an accesskey, because that's fairly su-
-					# perfluous and conflicts with an accesskey (Ctrl-E) often
-					# used for editing in Safari.
-				 	if( in_array( $action, array( 'edit', 'submit' ) )
-				 	&& in_array( $key, array( 'edit', 'watch', 'unwatch' ))) {
+				 	if( isset($tab["tooltiponly"]) && $tab["tooltiponly"] ) {
 				 		echo $skin->tooltip( "ca-$key" );
 				 	} else {
 				 		echo $skin->tooltipAndAccesskey( "ca-$key" );