diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index d6f73bea8..fec9451c7 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -53,9 +53,8 @@ do_action('admin_print_scripts'); do_action("admin_head-$hook_suffix"); do_action('admin_head'); -if ( get_user_setting('mfold') == 'f' ) { +if ( get_user_setting('mfold') == 'f' ) $admin_body_class .= ' folded'; -} if ( $is_iphone ) { ?> @@ -84,6 +83,7 @@ if ( '' == $blog_name ) { if ( $blog_name != $blog_name_excerpt ) $blog_name_excerpt = trim($blog_name_excerpt) . '…'; $blog_name = $blog_name_excerpt; + unset($blog_name_excerpt); } $title_class = ''; if ( function_exists('mb_strlen') ) { @@ -110,6 +110,8 @@ if ( function_exists('mb_strlen') ) {
parent_file = $parent_file; @@ -123,6 +125,5 @@ screen_meta($current_screen); do_action('admin_notices'); -if ( $parent_file == 'options-general.php' ) { +if ( $parent_file == 'options-general.php' ) require(ABSPATH . 'wp-admin/options-head.php'); -} diff --git a/wp-admin/admin.php b/wp-admin/admin.php index d8b8b0008..4eaa5b117 100644 --- a/wp-admin/admin.php +++ b/wp-admin/admin.php @@ -42,7 +42,9 @@ if ( get_option('db_upgraded') ) { require_once( ABSPATH . WPINC . '/http.php' ); $response = wp_remote_get( admin_url( 'upgrade.php?step=1' ), array( 'timeout' => 120, 'httpversion' => '1.1' ) ); do_action( 'after_mu_upgrade', $response ); + unset($response); } + unset($c); } } @@ -123,16 +125,16 @@ if ( isset($plugin_page) ) { do_action($page_hook); } else { - if ( validate_file($plugin_page) ) { + if ( validate_file($plugin_page) ) wp_die(__('Invalid plugin page')); - } + if ( !( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) && !( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") && is_file(WPMU_PLUGIN_DIR . "/$plugin_page") ) ) wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page))); do_action('load-' . $plugin_page); - if (! isset($_GET['noheader'])) + if ( !isset($_GET['noheader'])) require_once(ABSPATH . 'wp-admin/admin-header.php'); if ( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") ) @@ -156,12 +158,9 @@ if ( isset($plugin_page) ) { } // Allow plugins to define importers as well - if ( !isset($wp_importers) || !isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2])) - { + if ( !isset($wp_importers) || !isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2])) { if (! file_exists(ABSPATH . "wp-admin/import/$importer.php")) - { wp_die(__('Cannot load importer.')); - } include(ABSPATH . "wp-admin/import/$importer.php"); }