Changeset 12846

Timestamp:

01/26/2010 06:16:53 PM (12 years ago)

Author:

ryan

Message:

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

Location:

trunk/wp-admin

Files:

• admin-header.php (modified) (4 diffs)
• admin.php (modified) (4 diffs)

trunk/wp-admin/admin-header.php

@@ -54 +54 @@
 do_action('admin_head');
 
-if ( get_user_setting('mfold') == 'f' ) {
+if ( get_user_setting('mfold') == 'f' )
     $admin_body_class .= ' folded';
-}
 
 if ( $is_iphone ) { ?>
@@ -85 +84 @@
         $blog_name_excerpt = trim($blog_name_excerpt) . '…';
     $blog_name = $blog_name_excerpt;
+    unset($blog_name_excerpt);
 }
 $title_class = '';
@@ -111 +111 @@
 <div id="wpbody">
 <?php
+unset($title_class, $blog_name);
+
 require(ABSPATH . 'wp-admin/menu-header.php');
 
@@ -124 +126 @@
 do_action('admin_notices');
 
-if ( $parent_file == 'options-general.php' ) {
+if ( $parent_file == 'options-general.php' )
     require(ABSPATH . 'wp-admin/options-head.php');
-}

trunk/wp-admin/admin.php

@@ -43 +43 @@
             $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);
     }
 }
@@ -124 +126 @@
         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") ) )
@@ -133 +135 @@
         do_action('load-' . $plugin_page);
 
-        if (! isset($_GET['noheader']))
+        if ( !isset($_GET['noheader']))
             require_once(ABSPATH . 'wp-admin/admin-header.php');
 
@@ -157 +159 @@
 
     // 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");
     }