Changeset 18937

Timestamp:

10/10/2011 11:31:36 PM (15 years ago)

Author:

nacin

Message:

Use AJAX request and usermeta rather than user settings for dismissing admin bar pointers. see #18693.

Location:

trunk/wp-admin

Files:

• admin-ajax.php (modified) (1 diff)
• includes/template.php (modified) (3 diffs)

trunk/wp-admin/admin-ajax.php

@@ -1574 +1574 @@
         update_post_meta( $post_id, '_edit_lock', $new_lock, implode( ':', $active_lock ) );
         die( '1' );
-
+case 'dismiss-wp-pointer' :
+        $pointer = $_POST['pointer'];
+        if ( $pointer != sanitize_key( $pointer ) )
+                die( '0' );
+
+//      check_ajax_referer( 'dismiss-pointer_' . $pointer );
+
+        $dismissed = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) );
+
+        if ( in_array( $pointer, $dismissed ) )
+                die( '0' );
+
+        $dismissed[] = $pointer;
+        $dismissed = implode( ',', $dismissed );
+
+        update_user_meta( get_current_user_id(), 'dismissed_wp_pointers', $dismissed );
+        die( '1' );
+        break;
 default :
         do_action( 'wp_ajax_' . $_POST['action'] );

trunk/wp-admin/includes/template.php

@@ -1641 +1641 @@
         $enqueue = false;
 
-        $admin_bar = get_user_setting( 'p0', 0 );
-        if ( ! $admin_bar && apply_filters( 'show_wp_pointer_admin_bar', true ) ) {
+        $dismissed = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) );
+
+        if ( ! in_array( 'wp330-admin-bar', $dismissed ) && apply_filters( 'show_wp_pointer_admin_bar', true ) ) {
                 $enqueue = true;
                 add_action( 'admin_print_footer_scripts', '_wp_pointer_print_admin_bar' );
@@ -1656 +1657 @@
 
 function _wp_pointer_print_admin_bar() {
-        $pointer_content  = '<h3>' . ('The admin bar has been updated in WordPress 3.3.') . '</h3>';
-        $pointer_content .= '<p>' . sprintf( ('Have some feedback? Visit this <a href="%s">ticket</a>.'), 'http://core.trac.wordpress.org/ticket/18197' ) . '</p>';
-        $pointer_content .= '<p>' . sprintf( ('P.S. You are looking at a new admin pointer. Chime in <a href="%s">here</a>.'), 'http://core.trac.wordpress.org/ticket/18693' ) . '</p>';
+        $pointer_content  = '<h3>' . 'The admin bar has been updated in WordPress 3.3.' . '</h3>';
+        $pointer_content .= '<p>' . sprintf( 'Have some feedback? Visit the <a href="%s">forum</a>.', 'http://wordpress.org/support/forum/alphabeta' ) . '</p>';
+        $pointer_content .= '<p>' . 'P.S. You are looking at a new admin pointer.' . '</p>';
 
 ?>
@@ -1672 +1673 @@
                 },
                 close: function() {
-                        setUserSetting( 'p0', '1' );
+                        $.post( ajaxurl, {
+                                        pointer: 'wp330-admin-bar',
+                                //      _ajax_nonce: $('#_ajax_nonce').val(),
+                                        action: 'dismiss-wp-pointer'
+                        });
                 }
         }).pointer('open');