<!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>[15938] trunk: Don't show the admin bar in the plugin/theme installers.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15938">15938</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-10-23 19:49:25 +0000 (Sat, 23 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't show the admin bar in the plugin/theme installers. Inserts condition directly into iframe_header(). Allows show_admin_bar() to be called after init by unsetting wp_admin_bar, thus preventing render once those hooks are fired. see <a href="http://trac.wordpress.org/ticket/14772">#14772</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (15937 => 15938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-10-23 19:20:47 UTC (rev 15937)
+++ trunk/wp-admin/includes/template.php 2010-10-23 19:49:25 UTC (rev 15938)
</span><span class="lines">@@ -1529,7 +1529,8 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx"> function iframe_header( $title = '', $limit_styles = false ) {
</span><del>-global $hook_suffix;
</del><ins>+ show_admin_bar( false );
+ global $hook_suffix;
</ins><span class="cx"> ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
</span><span class="cx"> <html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>>
</span><span class="cx"> <head>
</span></span></pre></div>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (15937 => 15938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2010-10-23 19:20:47 UTC (rev 15937)
+++ trunk/wp-includes/admin-bar.php 2010-10-23 19:49:25 UTC (rev 15938)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !is_object( $wp_admin_bar ) )
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> $wp_admin_bar->load_user_locale_translations();
</span><span class="cx">
</span><span class="cx"> do_action( 'wp_before_admin_bar_render' );
</span><span class="lines">@@ -226,8 +226,11 @@
</span><span class="cx"> * Load up the CSS needed to render the admin bar nice and pretty.
</span><span class="cx"> */
</span><span class="cx"> function wp_admin_bar_css() {
</span><del>- global $pagenow, $wp_locale;
</del><ins>+ global $pagenow, $wp_locale, $wp_admin_bar;
</ins><span class="cx">
</span><ins>+ if ( !is_object( $wp_admin_bar ) )
+ return false;
+
</ins><span class="cx"> if ( !is_user_logged_in() )
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (15937 => 15938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-10-23 19:20:47 UTC (rev 15937)
+++ trunk/wp-includes/functions.php 2010-10-23 19:49:25 UTC (rev 15938)
</span><span class="lines">@@ -4431,6 +4431,11 @@
</span><span class="cx"> } else {
</span><span class="cx"> $old_value = $show_admin_bar;
</span><span class="cx"> $show_admin_bar = $show;
</span><ins>+
+ // Prevent rendering if already initiated.
+ if ( ! $show_admin_bar && isset( $GLOBALS['wp_admin_bar'] ) )
+ $GLOBALS['wp_admin_bar'] = null;
+
</ins><span class="cx"> return $old_value;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>