Ticket #19338: 19338.diff

wp-admin/includes/dashboard.php

@@ -138 +138 @@
                 exit;
         }
 
+        if ( isset( $_GET['action'] ) && 'dismiss-welcome-panel' == $_GET['action'] ) {
+                if ( current_user_can( 'edit_theme_options' ) )
+                        delete_user_option( get_current_user_id(), 'show_welcome_panel' );
+        }
+
         if ( $update )
                 update_option( 'dashboard_widget_options', $widget_options );
 
@@ -1283 +1288 @@
         ?>
         <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( add_query_arg( 'action', 'dismiss-welcome-panel', admin_url( 'index.php' ) ) ); ?>"><?php _e( 'Dismiss' ); ?></a>
         <div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
 
         <div class="welcome-panel-content">
@@ -1349 +1354 @@
                 endif; ?>
         </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( add_query_arg( 'action', 'dismiss-welcome-panel', admin_url( 'index.php' ) ) ) ); ?></p>
         </div>
         </div>
         <?php

wp-admin/js/dashboard.dev.js

@@ -15 +15 @@
         if ( welcomePanel.hasClass('hidden') && welcomePanelHide.prop('checked') )
                 welcomePanel.removeClass('hidden');
 
-        $('.welcome-panel-close, .welcome-panel-dismiss a', welcomePanel).click( function() {
+        $('.welcome-panel-close, .welcome-panel-dismiss a', welcomePanel).click( function(e) {
+                e.preventDefault();
                 welcomePanel.addClass('hidden');
                 updateWelcomePanel( 0 );
                 $('#wp_welcome_panel-hide').prop('checked', false);