Changeset 19389

Timestamp:

11/21/2011 11:04:35 PM (15 years ago)

Author:

nacin

Message:

Remove old dismissed pointers as the IDs have changed. Switch to underscores that way we don't need to translate them for method names. Avoid an empty pointer in the array. see #18693.

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (6 diffs)
• wp-admin/includes/upgrade.php (modified) (2 diffs)
• wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -1576 +1576 @@
 //      check_ajax_referer( 'dismiss-pointer_' . $pointer );
 
-        $dismissed = explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) );
+        $dismissed = array_filter( explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) ) );
 
         if ( in_array( $pointer, $dismissed ) )

trunk/wp-admin/includes/template.php

@@ -1674 +1674 @@
          *     remove_action( 'admin_enqueue_scripts', array( 'WP_Internal_Pointers', 'enqueue_scripts' ) );
          *
-         * Individual pointers (e.g. wp330-toolbar) can be disabled using the following:
+         * Individual pointers (e.g. wp330_toolbar) can be disabled using the following:
          *     remove_action( 'admin_print_footer_scripts', array( 'WP_Internal_Pointers', 'pointer_wp330_toolbar' ) );
          */
@@ -1683 +1683 @@
                  */
                 $registered_pointers = array(
-                        'index.php'    => 'wp330-toolbar',
-                        'post-new.php' => 'wp330-media-uploader',
-                        'themes.php'   => 'wp330-saving-widgets',
+                        'index.php'    => 'wp330_toolbar',
+                        'post-new.php' => 'wp330_media_uploader',
+                        'post.php'     => 'wp330_media_uploader',
+                        'themes.php'   => 'wp330_saving_widgets',
                 );
 
@@ -1702 +1703 @@
 
                 // Bind pointer print function
-                add_action( 'admin_print_footer_scripts', array( 'WP_Internal_Pointers', 'pointer_' . str_replace( '-', '_', $pointer ) ) );
+                add_action( 'admin_print_footer_scripts', array( 'WP_Internal_Pointers', 'pointer_' . $pointer ) );
 
                 // Add pointers script and style to queue
@@ -1754 +1755 @@
                         $content .= '<p>' .esc_js( __( 'Network Admin is now located in the My Sites menu.' ) ) . '</p>';
 
-                WP_Internal_Pointers::print_js( 'wp330-toolbar', '#wpadminbar', array(
+                WP_Internal_Pointers::print_js( 'wp330_toolbar', '#wpadminbar', array(
                         'content'  => $content,
                         'position' => array( 'edge' => 'top', 'align' => 'center' ),
@@ -1769 +1770 @@
                 $content .= '<p>' . esc_js( __( 'The single media icon now launches the uploader for all file types, and the new drag and drop interface makes uploading a breeze.' ) ) . '</p>';
 
-                WP_Internal_Pointers::print_js( 'wp330-media-uploader', '#content-add_media', array(
+                WP_Internal_Pointers::print_js( 'wp330_media_uploader', '#content-add_media', array(
                         'content'  => $content,
                         'position' => array( 'edge' => 'left', 'align' => 'center' ),
@@ -1784 +1785 @@
                 $content .= '<p>' . esc_js( __( 'If you change your mind and revert to your previous theme, we&#8217;ll put the widgets back the way you had them.' ) ) . '</p>';
 
-                WP_Internal_Pointers::print_js( 'wp330-saving-widgets', '#message2', array(
+                WP_Internal_Pointers::print_js( 'wp330_saving_widgets', '#message2', array(
                         'content'  => $content,
                         'position' => array( 'edge' => 'top', 'align' => 'left' ),

trunk/wp-admin/includes/upgrade.php

@@ -452 +452 @@
                 upgrade_300();
 
-        if ( $wp_current_db_version < 19061 )
+        if ( $wp_current_db_version < 19389 )
                 upgrade_330();
 
@@ -1146 +1146 @@
                 $wpdb->query( "DELETE FROM $wpdb->usermeta WHERE meta_key IN ('show_admin_bar_admin', 'plugins_last_view')" );
         }
+
+        // 3.3-beta. Can remove before release.
+        if ( $wp_current_db_version > 18715 && $wp_current_db_version < 19389
+                && is_main_site() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) )
+                        delete_metadata( 'user', 0, 'dismissed_wp_pointers', '', true );
+
 
         if ( $wp_current_db_version >= 11548 )

trunk/wp-includes/version.php

@@ -12 +12 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 19364;
+$wp_db_version = 19389;
 
 /**