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

unset temp vars so they don't pollute the global namespace. Formatting cleanups 

git-svn-id: http://svn.automattic.com/wordpress/trunk@12846 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-01-26 18:16:53 +00:00
parent 055f3db3a3
commit ef301b7489
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,9 +53,8 @@ do_action('admin_print_scripts');
do_action("admin_head-$hook_suffix"); do_action("admin_head-$hook_suffix");
do_action('admin_head'); do_action('admin_head');
if ( get_user_setting('mfold') == 'f' ) { if ( get_user_setting('mfold') == 'f' )
$admin_body_class .= ' folded'; $admin_body_class .= ' folded';
}
if ( $is_iphone ) { ?> if ( $is_iphone ) { ?>
<style type="text/css">.row-actions{visibility:visible;}</style> <style type="text/css">.row-actions{visibility:visible;}</style>
@ -84,6 +83,7 @@ if ( '' == $blog_name ) {
if ( $blog_name != $blog_name_excerpt ) if ( $blog_name != $blog_name_excerpt )
$blog_name_excerpt = trim($blog_name_excerpt) . '&hellip;'; $blog_name_excerpt = trim($blog_name_excerpt) . '&hellip;';
$blog_name = $blog_name_excerpt; $blog_name = $blog_name_excerpt;
unset($blog_name_excerpt);
} }
$title_class = ''; $title_class = '';
if ( function_exists('mb_strlen') ) { if ( function_exists('mb_strlen') ) {
@ -110,6 +110,8 @@ if ( function_exists('mb_strlen') ) {
<div id="wpbody"> <div id="wpbody">
<?php <?php
unset($title_class, $blog_name);
require(ABSPATH . 'wp-admin/menu-header.php'); require(ABSPATH . 'wp-admin/menu-header.php');
$current_screen->parent_file = $parent_file; $current_screen->parent_file = $parent_file;
@ -123,6 +125,5 @@ screen_meta($current_screen);
do_action('admin_notices'); do_action('admin_notices');
if ( $parent_file == 'options-general.php' ) { if ( $parent_file == 'options-general.php' )
require(ABSPATH . 'wp-admin/options-head.php'); require(ABSPATH . 'wp-admin/options-head.php');
}

11
wp-admin/admin.php
View File

@ -42,7 +42,9 @@ if ( get_option('db_upgraded') ) {
require_once( ABSPATH . WPINC . '/http.php' ); require_once( ABSPATH . WPINC . '/http.php' );
$response = wp_remote_get( admin_url( 'upgrade.php?step=1' ), array( 'timeout' => 120, 'httpversion' => '1.1' ) ); $response = wp_remote_get( admin_url( 'upgrade.php?step=1' ), array( 'timeout' => 120, 'httpversion' => '1.1' ) );
do_action( 'after_mu_upgrade', $response ); do_action( 'after_mu_upgrade', $response );
unset($response);
} }
unset($c);
} }
} }
@ -123,9 +125,9 @@ if ( isset($plugin_page) ) {
do_action($page_hook); do_action($page_hook);
} else { } else {
if ( validate_file($plugin_page) ) { if ( validate_file($plugin_page) )
wp_die(__('Invalid 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") ) ) 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))); wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
@ -156,12 +158,9 @@ if ( isset($plugin_page) ) {
} }
// Allow plugins to define importers as well // 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")) if (! file_exists(ABSPATH . "wp-admin/import/$importer.php"))
{
wp_die(__('Cannot load importer.')); wp_die(__('Cannot load importer.'));
}
include(ABSPATH . "wp-admin/import/$importer.php"); include(ABSPATH . "wp-admin/import/$importer.php");
} }