Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 17:18:32 +01:00
Code Issues Projects Releases Wiki Activity

Admin globals:

Browse Source 
* Declare `$wp_importers` as a global in `admin.php`
* Declare `$post_type`, `$post_type_object`, and  `$post` as globals where applicable

See #30799.

Built from https://develop.svn.wordpress.org/trunk@31121


git-svn-id: http://core.svn.wordpress.org/trunk@31102 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-01-10 05:29:22 +00:00
parent ac654632fe
commit 84867b3e9c
7 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/admin.php
View File

@ -91,9 +91,11 @@ $time_format = get_option('time_format');
wp_enqueue_script( 'common' );
// $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;

2
wp-admin/edit-form-advanced.php
View File

@ -10,6 +10,8 @@
if ( !defined('ABSPATH') )
die('-1');
global $post_type, $post_type_object, $post;
wp_enqueue_script('post');
$_wp_editor_expand = $_content_editor_dfw = false;

3
wp-admin/edit-tags.php
View File

@ -20,6 +20,9 @@ if ( ! $tax )
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');
$pagenum = $wp_list_table->get_pagenum();

2
wp-admin/edit.php
View File

@ -18,6 +18,8 @@ if ( 'attachment' === $typenow ) {
}
}
global $post_type, $post_type_object;
$post_type = $typenow;
$post_type_object = get_post_type_object( $post_type );

14
wp-admin/post-new.php
View File

@ -9,13 +9,15 @@
/** Load WordPress Administration Bootstrap */
require_once( dirname( __FILE__ ) . '/admin.php' );
if ( !isset($_GET['post_type']) )
$post_type = 'post';
elseif ( in_array( $_GET['post_type'], get_post_types( array('show_ui' => true ) ) ) )
$post_type = $_GET['post_type'];
else
wp_die( __('Invalid 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 ) ) ) ) {
$post_type = $_GET['post_type'];
} else {
wp_die( __('Invalid post type') );
}
$post_type_object = get_post_type_object( $post_type );
if ( 'post' == $post_type ) {

2
wp-admin/post.php
View File

@ -23,7 +23,7 @@ elseif ( isset( $_POST['post_ID'] ) )
else
$post_id = $post_ID = 0;
$post = $post_type = $post_type_object = null;
global $post_type, $post_type_object, $post;
if ( $post_id )
$post = get_post( $post_id );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-alpha-31120';
$wp_version = '4.2-alpha-31121';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.