<!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>[15834] trunk:
Allow turning off the admin bar via WP_SHOW_ADMIN_BAR constant,
no_admin_bar() function, or show_admin_bar filter.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15834">15834</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-10-18 17:58:36 +0000 (Mon, 18 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow turning off the admin bar via WP_SHOW_ADMIN_BAR constant, no_admin_bar() function, or show_admin_bar filter. see <a href="http://trac.wordpress.org/ticket/14772">#14772</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmediauploadphp">trunk/wp-admin/media-upload.php</a></li>
<li><a href="#trunkwpadminpressthisphp">trunk/wp-admin/press-this.php</a></li>
<li><a href="#trunkwpadminupdatephp">trunk/wp-admin/update.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="trunkwpadminmediauploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/media-upload.php (15833 => 15834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/media-upload.php 2010-10-18 17:11:00 UTC (rev 15833)
+++ trunk/wp-admin/media-upload.php 2010-10-18 17:58:36 UTC (rev 15834)
</span><span class="lines">@@ -9,6 +9,8 @@
</span><span class="cx"> * @subpackage Administration
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+define('WP_SHOW_ADMIN_BAR' , false);
+
</ins><span class="cx"> /** Load WordPress Administration Bootstrap */
</span><span class="cx"> require_once('./admin.php');
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/press-this.php (15833 => 15834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/press-this.php 2010-10-18 17:11:00 UTC (rev 15833)
+++ trunk/wp-admin/press-this.php 2010-10-18 17:58:36 UTC (rev 15834)
</span><span class="lines">@@ -6,8 +6,11 @@
</span><span class="cx"> * @subpackage Press_This
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+define('WP_SHOW_ADMIN_BAR' , false);
+
</ins><span class="cx"> /** WordPress Administration Bootstrap */
</span><span class="cx"> require_once('./admin.php');
</span><ins>+
</ins><span class="cx"> header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
</span><span class="cx">
</span><span class="cx"> if ( ! current_user_can('edit_posts') )
</span></span></pre></div>
<a id="trunkwpadminupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update.php (15833 => 15834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update.php 2010-10-18 17:11:00 UTC (rev 15833)
+++ trunk/wp-admin/update.php 2010-10-18 17:58:36 UTC (rev 15834)
</span><span class="lines">@@ -6,6 +6,8 @@
</span><span class="cx"> * @subpackage Administration
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+define('WP_SHOW_ADMIN_BAR' , false);
+
</ins><span class="cx"> /** WordPress Administration Bootstrap */
</span><span class="cx"> require_once('./admin.php');
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (15833 => 15834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2010-10-18 17:11:00 UTC (rev 15833)
+++ trunk/wp-includes/admin-bar.php 2010-10-18 17:58:36 UTC (rev 15834)
</span><span class="lines">@@ -11,12 +11,20 @@
</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><ins>+ 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, get_current_screen() ) )
+ return false;
+
</ins><span class="cx"> /* Set the protocol constant used throughout this code */
</span><span class="cx"> if ( !defined( 'PROTO' ) )
</span><span class="cx"> if ( is_ssl() ) define( 'PROTO', 'https://' ); else define( 'PROTO', 'http://' );
</span><span class="cx">
</span><del>- /* Don't load the admin bar if the user is not logged in, or we are using press this */
- if ( !is_user_logged_in() || 'press-this.php' == $pagenow || 'update.php' == $pagenow )
</del><ins>+ /* Don't load the admin bar if the user is not logged in */
+ if ( !is_user_logged_in() )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> /* Set up the settings we need to render menu items */
</span><span class="lines">@@ -26,7 +34,7 @@
</span><span class="cx"> /* Enqueue the JS files for the admin bar. */
</span><span class="cx"> if ( is_user_logged_in() )
</span><span class="cx"> wp_enqueue_script( 'jquery', false, false, false, true );
</span><del>-
</del><ins>+
</ins><span class="cx"> /* Load the admin bar class code ready for instantiation */
</span><span class="cx"> require( ABSPATH . WPINC . '/admin-bar/admin-bar-class.php' );
</span><span class="cx">
</span><span class="lines">@@ -38,6 +46,9 @@
</span><span class="cx">
</span><span class="cx"> /* Initialize the admin bar */
</span><span class="cx"> $wp_admin_bar = new wp_admin_bar();
</span><ins>+
+ add_action( 'wp_head', 'wp_admin_bar_css' );
+ add_action( 'admin_head', 'wp_admin_bar_css' );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'init', 'wp_admin_bar_init' );
</span><span class="cx">
</span><span class="lines">@@ -221,7 +232,7 @@
</span><span class="cx"> function wp_admin_bar_css() {
</span><span class="cx"> global $pagenow, $wp_locale;
</span><span class="cx">
</span><del>- if ( !is_user_logged_in() || 'press-this.php' == $pagenow || 'update.php' == $pagenow || 'media-upload.php' == $pagenow )
</del><ins>+ if ( !is_user_logged_in() )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> $nobump = false;
</span><span class="lines">@@ -232,8 +243,6 @@
</span><span class="cx"> <!--[if IE 6]><style type="text/css">#wpadminbar, #wpadminbar .menupop a span, #wpadminbar .menupop ul li a:hover, #wpadminbar .myaccount a, .quicklinks a:hover,#wpadminbar .menupop:hover { background-image: none !important; } #wpadminbar .myaccount a { margin-left:0 !important; padding-left:12px !important;}</style><![endif]-->
</span><span class="cx"> <style type="text/css" media="print">#wpadminbar { display:none; }</style><?php
</span><span class="cx"> }
</span><del>-add_action( 'wp_head', 'wp_admin_bar_css' );
-add_action( 'admin_head', 'wp_admin_bar_css' );
</del><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Load up the JS needed to allow the admin bar to function correctly.
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (15833 => 15834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-10-18 17:11:00 UTC (rev 15833)
+++ trunk/wp-includes/functions.php 2010-10-18 17:58:36 UTC (rev 15834)
</span><span class="lines">@@ -4408,3 +4408,14 @@
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+
+/**
+ * Prevents the admin bar from being shown for the current screen.
+ *
+ * This can be called immediately upon plugin load. It does not need to be called from a function hooked to the init action.
+ *
+ * @since 3.1.0
+ */
+function no_admin_bar() {
+ define('WP_SHOW_ADMIN_BAR', false);
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>