<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12846] trunk/wp-admin: unset temp vars so they don'
t pollute the global namespace.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12846">12846</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-26 18:16:53 +0000 (Tue, 26 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>unset temp vars so they don't pollute the global namespace. Formatting cleanups</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminheaderphp">trunk/wp-admin/admin-header.php</a></li>
<li><a href="#trunkwpadminadminphp">trunk/wp-admin/admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-header.php (12845 => 12846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-header.php 2010-01-26 18:09:45 UTC (rev 12845)
+++ trunk/wp-admin/admin-header.php 2010-01-26 18:16:53 UTC (rev 12846)
</span><span class="lines">@@ -53,9 +53,8 @@
</span><span class="cx"> do_action("admin_head-$hook_suffix");
</span><span class="cx"> do_action('admin_head');
</span><span class="cx">
</span><del>-if ( get_user_setting('mfold') == 'f' ) {
</del><ins>+if ( get_user_setting('mfold') == 'f' )
</ins><span class="cx"> $admin_body_class .= ' folded';
</span><del>-}
</del><span class="cx">
</span><span class="cx"> if ( $is_iphone ) { ?>
</span><span class="cx"> <style type="text/css">.row-actions{visibility:visible;}</style>
</span><span class="lines">@@ -84,6 +83,7 @@
</span><span class="cx"> if ( $blog_name != $blog_name_excerpt )
</span><span class="cx"> $blog_name_excerpt = trim($blog_name_excerpt) . '&hellip;';
</span><span class="cx"> $blog_name = $blog_name_excerpt;
</span><ins>+ unset($blog_name_excerpt);
</ins><span class="cx"> }
</span><span class="cx"> $title_class = '';
</span><span class="cx"> if ( function_exists('mb_strlen') ) {
</span><span class="lines">@@ -110,6 +110,8 @@
</span><span class="cx">
</span><span class="cx"> <div id="wpbody">
</span><span class="cx"> <?php
</span><ins>+unset($title_class, $blog_name);
+
</ins><span class="cx"> require(ABSPATH . 'wp-admin/menu-header.php');
</span><span class="cx">
</span><span class="cx"> $current_screen->parent_file = $parent_file;
</span><span class="lines">@@ -123,6 +125,5 @@
</span><span class="cx">
</span><span class="cx"> do_action('admin_notices');
</span><span class="cx">
</span><del>-if ( $parent_file == 'options-general.php' ) {
</del><ins>+if ( $parent_file == 'options-general.php' )
</ins><span class="cx"> require(ABSPATH . 'wp-admin/options-head.php');
</span><del>-}
</del></span></pre></div>
<a id="trunkwpadminadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin.php (12845 => 12846)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin.php 2010-01-26 18:09:45 UTC (rev 12845)
+++ trunk/wp-admin/admin.php 2010-01-26 18:16:53 UTC (rev 12846)
</span><span class="lines">@@ -42,7 +42,9 @@
</span><span class="cx"> require_once( ABSPATH . WPINC . '/http.php' );
</span><span class="cx"> $response = wp_remote_get( admin_url( 'upgrade.php?step=1' ), array( 'timeout' => 120, 'httpversion' => '1.1' ) );
</span><span class="cx"> do_action( 'after_mu_upgrade', $response );
</span><ins>+ unset($response);
</ins><span class="cx"> }
</span><ins>+ unset($c);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -123,16 +125,16 @@
</span><span class="cx">
</span><span class="cx"> do_action($page_hook);
</span><span class="cx"> } else {
</span><del>- if ( validate_file($plugin_page) ) {
</del><ins>+ if ( validate_file($plugin_page) )
</ins><span class="cx"> wp_die(__('Invalid plugin page'));
</span><del>- }
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> 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") ) )
</span><span class="cx"> wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
</span><span class="cx">
</span><span class="cx"> do_action('load-' . $plugin_page);
</span><span class="cx">
</span><del>- if (! isset($_GET['noheader']))
</del><ins>+ if ( !isset($_GET['noheader']))
</ins><span class="cx"> require_once(ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx">
</span><span class="cx"> if ( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") )
</span><span class="lines">@@ -156,12 +158,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Allow plugins to define importers as well
</span><del>- if ( !isset($wp_importers) || !isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2]))
- {
</del><ins>+ if ( !isset($wp_importers) || !isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2])) {
</ins><span class="cx"> if (! file_exists(ABSPATH . "wp-admin/import/$importer.php"))
</span><del>- {
</del><span class="cx"> wp_die(__('Cannot load importer.'));
</span><del>- }
</del><span class="cx"> include(ABSPATH . "wp-admin/import/$importer.php");
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>