Changes from branches/2.6/wp-admin/admin-header.php at r8418 to trunk/wp-admin/admin-header.php at r8249

File:

• trunk/wp-admin/admin-header.php (modified) (4 diffs)

trunk/wp-admin/admin-header.php

@@ -75 +75 @@
 
 <?php
-if ( ! $is_opera ) { 
+$gears_compat = false;
+
+if ( ($is_gecko || $is_winIE) && strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'webkit') === false ) { 
+    $gears_compat = true;
 ?>
     <div id="gears-info-box" class="info-box" style="display:none;">
@@ -91 +94 @@
     <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3>
     <p><?php _e('Gears is installed on this computer but is not enabled for use with WordPress.'); ?></p> 
-    <p><?php 
-    
-    if ( $is_safari )
-        _e('To enable it, make sure this web site is not on the denied list in Gears Settings under the Safari menu, then click the button below.');
-    else
-        _e('To enable it, make sure this web site is not on the denied list in Gears Settings under your browser Tools menu, then click the button below.'); 
-    
-    ?></p>
+    <p><?php _e('To enable it, make sure this web site is not on the denied list in Gears Settings under your browser\'s Tools menu, then click the button below.'); ?></p>
     <p><strong><?php _e('However if this is a public or shared computer, Gears should not be enabled.'); ?></strong></p>
     <div class="submit"><button class="button" onclick="wpGears.getPermission();"><?php _e('Enable Gears'); ?></button>
@@ -106 +102 @@
     <div id="gears-msg3" style="display:none;">
     <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3>
-    <p><?php
-    
-    if ( $is_safari )
-        _e('Gears is installed and enabled on this computer. You can disable it from the Safari menu.');
-    else
-        _e('Gears is installed and enabled on this computer. You can disable it from your browser Tools menu.'); 
-    
-    ?></p>
+    <p><?php _e('Gears is installed and enabled on this computer. You can disable it from your browser Tools menu.'); ?></p>
     <p><?php _e('If there are any errors, try disabling Gears, then reload the page and enable it again.'); ?></p>
     <p><?php _e('Local storage status:'); ?> <span id="gears-wait"><span style="color:#f00;"><?php _e('Please wait! Updating files:'); ?></span> <span id="gears-upd-number"></span></span></p>
@@ -119 +108 @@
     </div>
     </div>
+
 <?php } ?>
 
-<div id="user_info"><p><?php printf(__('Howdy, <a href="%1$s">%2$s</a>!'), 'profile.php', $user_identity) ?> | <a href="<?php echo site_url('wp-login.php?action=logout', 'login') ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a> | <?php _e('<a href="http://codex.wordpress.org/">Help</a>') ?> | <?php _e('<a href="http://wordpress.org/support/">Forums</a>'); if ( ! $is_opera ) { ?> | <span id="gears-menu"><a href="#" onclick="wpGears.message(1);return false;"><?php _e('Turbo') ?></a></span><?php } ?></p></div>
+<div id="user_info"><p><?php printf(__('Howdy, <a href="%1$s">%2$s</a>!'), 'profile.php', $user_identity) ?> | <a href="<?php echo site_url('wp-login.php?action=logout', 'login') ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a> | <?php _e('<a href="http://codex.wordpress.org/">Help</a>') ?> | <?php _e('<a href="http://wordpress.org/support/">Forums</a>'); if ( $gears_compat ) { ?> | <span id="gears-menu"><a href="#" onclick="wpGears.message(1);return false;"><?php _e('Turbo') ?></a></span><?php } ?></p></div>
 
 <?php