Changeset 31121

Timestamp:

01/10/2015 05:28:46 AM (10 years ago)

Author:

wonderboymusic

Message:

Admin globals:

• Declare $wp_importers as a global in admin.php
• Declare $post_type, $post_type_object, and $post as globals where applicable

See #30799.

Location:

trunk/src/wp-admin

Files:

• admin.php (modified) (1 diff)
• edit-form-advanced.php (modified) (1 diff)
• edit-tags.php (modified) (1 diff)
• edit.php (modified) (1 diff)
• post-new.php (modified) (1 diff)
• post.php (modified) (1 diff)

trunk/src/wp-admin/admin.php

@@ -92 +92 @@
 
 // $pagenow is set in vars.php
+// $wp_importers is sometimes set in wp-admin/includes/import.php
+//
 // The remaining variables are imported as globals elsewhere,
 //     declared as globals here
-global $pagenow, $hook_suffix, $plugin_page, $typenow, $taxnow;
+global $pagenow, $wp_importers, $hook_suffix, $plugin_page, $typenow, $taxnow;
 
 $page_hook = null;

trunk/src/wp-admin/edit-form-advanced.php

@@ -10 +10 @@
 if ( !defined('ABSPATH') )
     die('-1');
+
+global $post_type, $post_type_object, $post;
 
 wp_enqueue_script('post');

trunk/src/wp-admin/edit-tags.php

@@ -20 +20 @@
 if ( ! current_user_can( $tax->cap->manage_terms ) )
     wp_die( __( 'Cheatin’ uh?' ), 403 );
+
+// $post_type is set when the WP_Terms_List_Table instance is created
+global $post_type;
 
 $wp_list_table = _get_list_table('WP_Terms_List_Table');

trunk/src/wp-admin/edit.php

@@ -18 +18 @@
     }
 }
+
+global $post_type, $post_type_object;
 
 $post_type = $typenow;

trunk/src/wp-admin/post-new.php

@@ -10 +10 @@
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( !isset($_GET['post_type']) )
+global $post_type, $post_type_object, $post;
+
+if ( ! isset( $_GET['post_type'] ) ) {
     $post_type = 'post';
-elseif ( in_array( $_GET['post_type'], get_post_types( array('show_ui' => true ) ) ) )
+} elseif ( in_array( $_GET['post_type'], get_post_types( array('show_ui' => true ) ) ) ) {
     $post_type = $_GET['post_type'];
-else
+} else {
     wp_die( __('Invalid post type') );
-
+}
 $post_type_object = get_post_type_object( $post_type );
 

trunk/src/wp-admin/post.php

@@ -24 +24 @@
     $post_id = $post_ID = 0;
 
-$post = $post_type = $post_type_object = null;
+global $post_type, $post_type_object, $post;
 
 if ( $post_id )