Changeset 19418 for trunk/wp-admin/includes/dashboard.php

Timestamp:

11/23/2011 06:30:45 PM (13 years ago)

Author:

nacin

Message:

Change show/hide storage mechanism for show_welcome_panel. 0 = hide, 1 = show, 2 = show if the multisite owner. Make welcome panel dismissable without JS (openable too via the URL). fixes #19338, fixes #19127.

File:

• trunk/wp-admin/includes/dashboard.php (modified) (3 diffs)

trunk/wp-admin/includes/dashboard.php

@@ -1277 +1277 @@
     $classes = 'welcome-panel';
 
-    if ( ! get_user_option( 'show_welcome_panel' ) )
+    $option = get_user_meta( get_current_user_id(), 'show_welcome_panel', true );
+    // 0 = hide, 1 = toggled to show or single site creator, 2 = multisite site owner
+    $hide = 0 == $option || ( 2 == $option && wp_get_current_user()->user_email != get_option( 'admin_email' ) );
+    if ( $hide )
         $classes .= ' hidden';
 
@@ -1284 +1287 @@
     <div id="welcome-panel" class="<?php echo esc_attr( $classes ); ?>">
     <?php wp_nonce_field( 'welcome-panel-nonce', 'welcomepanelnonce', false ); ?>
-    <a class="welcome-panel-close" href="#"><?php _e('Dismiss'); ?></a>
+    <a class="welcome-panel-close" href="<?php echo esc_url( admin_url( '?welcome=0' ) ); ?>"><?php _e('Dismiss'); ?></a>
     <div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
 
@@ -1350 +1353 @@
     </div>
     </div>
-    <p class="welcome-panel-dismiss"><?php _e( 'Already know what you&#8217;re doing? <a href="#">Dismiss this message</a>.' ); ?></p>
+    <p class="welcome-panel-dismiss"><?php printf( __( 'Already know what you&#8217;re doing? <a href="%s">Dismiss this message</a>.' ), esc_url( admin_url( '?welcome=0' ) ) ); ?></p>
     </div>
     </div>