Changeset 19374

Timestamp:

11/21/2011 03:35:57 PM (13 years ago)

Author:

nacin

Message:

Set $parent_file for post-new.php when show_in_menu is a file. Provides for correct top-level highlighting. $submenu_file remains set to expect a post-new.php menu. see #19125.

Location:

trunk

Files:

• wp-admin/about.php (modified) (1 diff)
• wp-admin/admin-header.php (modified) (1 diff)
• wp-admin/credits.php (modified) (1 diff)
• wp-admin/freedoms.php (modified) (1 diff)
• wp-admin/post-new.php (modified) (1 diff)
• wp-content/themes/twentyeleven/image.php (modified) (1 diff)
• wp-includes/plugin.php (modified) (1 diff)

trunk/wp-admin/about.php

@@ -11 +11 @@
 
 $title = __( 'About' );
+$parent_file = 'about.php';
 
 list( $display_version ) = explode( '-', $wp_version );

trunk/wp-admin/admin-header.php

@@ -115 +115 @@
 elseif ( is_user_admin() )
     do_action('user_admin_notices');
-else
+elseif ( 'about' != $current_screen->parent_base )
     do_action('admin_notices');
 
-do_action('all_admin_notices');
+if ( 'about' != $current_screen->parent_base )
+    do_action('all_admin_notices');
 
 if ( $parent_file == 'options-general.php' )

trunk/wp-admin/credits.php

@@ -11 +11 @@
 
 $title = __( 'Credits' );
+$parent_file = 'about.php';
 
 add_contextual_help($current_screen,

trunk/wp-admin/freedoms.php

@@ -11 +11 @@
 
 $title = __( 'Freedoms' );
+$parent_file = 'about.php';
 
 list( $display_version ) = explode( '-', $wp_version );

trunk/wp-admin/post-new.php

@@ -17 +17 @@
     wp_die( __('Invalid post type') );
 
-if ( 'post' != $post_type ) {
-    $parent_file = "edit.php?post_type=$post_type";
-    $submenu_file = "post-new.php?post_type=$post_type";
-} else {
+$post_type_object = get_post_type_object( $post_type );
+
+if ( 'post' == $post_type ) {
     $parent_file = 'edit.php';
     $submenu_file = 'post-new.php';
+} else {
+    if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true )
+        $parent_file = $post_type_object->show_in_menu;
+    else
+        $parent_file = "edit.php?post_type=$post_type";
+    $submenu_file = "post-new.php?post_type=$post_type";
 }
-
-$post_type_object = get_post_type_object($post_type);
 
 $title = $post_type_object->labels->add_new_item;

trunk/wp-content/themes/twentyeleven/image.php

@@ -35 +35 @@
                                     $metadata['height'],
                                     esc_url( get_permalink( $post->post_parent ) ),
-                                    get_the_title( $post->post_parent )
+                                    $blah = get_the_title( $post->post_parent )
                                 );
+                                var_dump( $blah );
                             ?>
                             <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>

trunk/wp-includes/plugin.php

@@ -284 +284 @@
     if( isset($wp_filter[$tag]) ) {
         if( false !== $priority && isset($wp_filter[$tag][$priority]) )
-            unset($wp_filter[$tag][$priority]);
+            $wp_filter[$tag][$priority] = array();
         else
-            unset($wp_filter[$tag]);
+            $wp_filter[$tag] = array();
     }