<!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>[16043] trunk/wp-includes/functions.php:
  Missing part of the admin bar rework.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16043">16043</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-10-28 11:48:22 +0000 (Thu, 28 Oct 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Missing part of the admin bar rework. See <a href="http://trac.wordpress.org/ticket/14772">#14772</a> props filosofo.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (16042 => 16043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php        2010-10-28 08:48:52 UTC (rev 16042)
+++ trunk/wp-includes/functions.php        2010-10-28 11:48:22 UTC (rev 16043)
</span><span class="lines">@@ -4404,37 +4404,17 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * Retrieve or set the admin bar display state.
</del><ins>+ * Set the display status of the admin bar
</ins><span class="cx">  *
</span><span class="cx">  * This can be called immediately upon plugin load.  It does not need to be called from a function hooked to the init action.
</span><span class="cx">  *
</span><del>- * @param bool $show Optional. True to show the admin bar, false to hide it. If not provided the current display state is returned.
- * @return bool The current display state if $show is not provided, the previous disply state if $show is provided.
- *
</del><span class="cx">  * @since 3.1.0
</span><ins>+ *
+ * @param bool $show Whether to allow the admin bar to show.
+ * @return void
</ins><span class="cx">  */
</span><del>-function show_admin_bar( $show = null ) {
-        static $show_admin_bar = null;
-
-        if ( !isset($show_admin_bar) ) {
-                if ( null !== $show )
-                        $show_admin_bar = $show;
-                elseif ( defined('WP_SHOW_ADMIN_BAR') )
-                        $show_admin_bar = WP_SHOW_ADMIN_BAR;
-                else
-                        $show_admin_bar = true;
-        }
-
-        if ( null === $show ) {
-                return $show_admin_bar;
-        } else {
-                $old_value = $show_admin_bar;
-                $show_admin_bar = $show;
-
-                // Prevent rendering if already initiated.
-                if ( ! $show_admin_bar &amp;&amp; isset( $GLOBALS['wp_admin_bar'] ) )
-                        $GLOBALS['wp_admin_bar'] = null;
-
-                return $old_value;
-        }
</del><ins>+function show_admin_bar( $show ) {
+        global $show_admin_bar;
+        $show_admin_bar = (bool) $show;
</ins><span class="cx"> }
</span><ins>+
</ins></span></pre>
</div>
</div>

</body>
</html>