WordPress.org

Make WordPress Core

Changeset 12846


Ignore:
Timestamp:
01/26/2010 06:16:53 PM (8 years ago)
Author:
ryan
Message:

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

Location:
trunk/wp-admin
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/admin-header.php

    r12783 r12846  
    5454do_action('admin_head');
    5555
    56 if ( get_user_setting('mfold') == 'f' ) {
     56if ( get_user_setting('mfold') == 'f' )
    5757    $admin_body_class .= ' folded';
    58 }
    5958
    6059if ( $is_iphone ) { ?>
     
    8584        $blog_name_excerpt = trim($blog_name_excerpt) . '…';
    8685    $blog_name = $blog_name_excerpt;
     86    unset($blog_name_excerpt);
    8787}
    8888$title_class = '';
     
    111111<div id="wpbody">
    112112<?php
     113unset($title_class, $blog_name);
     114
    113115require(ABSPATH . 'wp-admin/menu-header.php');
    114116
     
    124126do_action('admin_notices');
    125127
    126 if ( $parent_file == 'options-general.php' ) {
     128if ( $parent_file == 'options-general.php' )
    127129    require(ABSPATH . 'wp-admin/options-head.php');
    128 }
  • trunk/wp-admin/admin.php

    r12797 r12846  
    4343            $response = wp_remote_get( admin_url( 'upgrade.php?step=1' ), array( 'timeout' => 120, 'httpversion' => '1.1' ) );
    4444            do_action( 'after_mu_upgrade', $response );
     45            unset($response);
    4546        }
     47        unset($c);
    4648    }
    4749}
     
    124126        do_action($page_hook);
    125127    } else {
    126         if ( validate_file($plugin_page) ) {
     128        if ( validate_file($plugin_page) )
    127129            wp_die(__('Invalid plugin page'));
    128         }
     130
    129131
    130132        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") ) )
     
    133135        do_action('load-' . $plugin_page);
    134136
    135         if (! isset($_GET['noheader']))
     137        if ( !isset($_GET['noheader']))
    136138            require_once(ABSPATH . 'wp-admin/admin-header.php');
    137139
     
    157159
    158160    // Allow plugins to define importers as well
    159     if ( !isset($wp_importers) || !isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2]))
    160     {
     161    if ( !isset($wp_importers) || !isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2])) {
    161162        if (! file_exists(ABSPATH . "wp-admin/import/$importer.php"))
    162         {
    163163            wp_die(__('Cannot load importer.'));
    164         }
    165164        include(ABSPATH . "wp-admin/import/$importer.php");
    166165    }
Note: See TracChangeset for help on using the changeset viewer.