<!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>[15863] trunk/wp-includes: show_admin_bar().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15863">15863</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-10-20 13:23:39 +0000 (Wed, 20 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>show_admin_bar(). see <a href="http://trac.wordpress.org/ticket/14772">#14772</a></pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (15862 => 15863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2010-10-20 13:07:54 UTC (rev 15862)
+++ trunk/wp-includes/admin-bar.php 2010-10-20 13:23:39 UTC (rev 15863)
</span><span class="lines">@@ -11,12 +11,7 @@
</span><span class="cx"> function wp_admin_bar_init() {
</span><span class="cx"> global $current_user, $pagenow, $wp_admin_bar;
</span><span class="cx">
</span><del>- if ( defined('WP_SHOW_ADMIN_BAR') )
- $show_it = (bool) WP_SHOW_ADMIN_BAR;
- else
- $show_it = true;
-
- if ( ! apply_filters( 'show_admin_bar', $show_it ) )
</del><ins>+ if ( ! show_admin_bar() )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> /* Set the protocol constant used throughout this code */
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (15862 => 15863)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-10-20 13:07:54 UTC (rev 15862)
+++ trunk/wp-includes/functions.php 2010-10-20 13:23:39 UTC (rev 15863)
</span><span class="lines">@@ -4405,12 +4405,32 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Prevents the admin bar from being shown for the current screen.
</del><ins>+ * Retrieve or set the admin bar display state.
</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><ins>+ * @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.
+ *
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> */
</span><del>-function no_admin_bar() {
- define('WP_SHOW_ADMIN_BAR', false);
</del><ins>+function show_admin_bar( $show = null ) {
+ static $show_admin_bar = null;
+
+ if ( !isset($show_admin_var) ) {
+ 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;
+ return $old_value;
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>