WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent the $title global from being stomped. Caused by merger of manage_columns_prefs() into screen_meta() in [15653]. see #14952, see #14776. The global is apparent cruft as the function doesn't use it. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@15662 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-09-26 09:16:38 +00:00
parent 47b9b4ab1c
commit ffacf3e36b
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-admin/admin-header.php
View File

@ -161,8 +161,12 @@ echo implode(' ', $links);
<?php <?php
unset($title_class, $blog_name); unset($title_class, $blog_name);
var_dump( $title );
require(ABSPATH . 'wp-admin/menu-header.php'); require(ABSPATH . 'wp-admin/menu-header.php');
var_dump( $title );
$current_screen->parent_file = $parent_file; $current_screen->parent_file = $parent_file;
$current_screen->parent_base = preg_replace('/\?.*$/', '', $parent_file); $current_screen->parent_base = preg_replace('/\?.*$/', '', $parent_file);
$current_screen->parent_base = str_replace('.php', '', $current_screen->parent_base); $current_screen->parent_base = str_replace('.php', '', $current_screen->parent_base);
@ -170,8 +174,11 @@ $current_screen->parent_base = str_replace('.php', '', $current_screen->parent_b
<div id="wpbody-content"> <div id="wpbody-content">
<?php <?php
var_dump( $title );
screen_meta($current_screen); screen_meta($current_screen);
var_dump( $title );
if ( is_multisite() ) { if ( is_multisite() ) {
if ( is_network_admin() ) if ( is_network_admin() )
do_action('network_admin_notices'); do_action('network_admin_notices');

2
wp-admin/includes/template.php
View File

@ -1635,7 +1635,7 @@ function convert_to_screen( $screen ) {
} }
function screen_meta($screen) { function screen_meta($screen) {
global $wp_meta_boxes, $_wp_contextual_help, $title, $wp_list_table; global $wp_meta_boxes, $_wp_contextual_help, $wp_list_table;
if ( is_string($screen) ) if ( is_string($screen) )
$screen = convert_to_screen($screen); $screen = convert_to_screen($screen);