<!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>[16221] trunk:
Remove WP_SHOW_ADMIN_BAR and go off existing and new defines on page type.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16221">16221</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-11-06 09:41:03 +0000 (Sat, 06 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove WP_SHOW_ADMIN_BAR and go off existing and new defines on page type. See <a href="http://trac.wordpress.org/ticket/15315">#15315</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminmediauploadphp">trunk/wp-admin/media-upload.php</a></li>
<li><a href="#trunkwpadminplugininstallphp">trunk/wp-admin/plugin-install.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="#trunkwpappphp">trunk/wp-app.php</a></li>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
<li><a href="#trunkxmlrpcphp">trunk/xmlrpc.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (16220 => 16221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-11-06 00:21:46 UTC (rev 16220)
+++ trunk/wp-admin/admin-ajax.php 2010-11-06 09:41:03 UTC (rev 16221)
</span><span class="lines">@@ -13,7 +13,6 @@
</span><span class="cx"> */
</span><span class="cx"> define('DOING_AJAX', true);
</span><span class="cx"> define('WP_ADMIN', true);
</span><del>-define('WP_SHOW_ADMIN_BAR' , false);
</del><span class="cx">
</span><span class="cx"> if ( ! isset( $_REQUEST['action'] ) )
</span><span class="cx"> die('-1');
</span></span></pre></div>
<a id="trunkwpadminmediauploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/media-upload.php (16220 => 16221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/media-upload.php 2010-11-06 00:21:46 UTC (rev 16220)
+++ trunk/wp-admin/media-upload.php 2010-11-06 09:41:03 UTC (rev 16221)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx"> * @subpackage Administration
</span><span class="cx"> */
</span><span class="cx">
</span><del>-define('WP_SHOW_ADMIN_BAR' , false);
</del><ins>+define('IFRAME_REQUEST' , true);
</ins><span class="cx">
</span><span class="cx"> /** Load WordPress Administration Bootstrap */
</span><span class="cx"> require_once('./admin.php');
</span></span></pre></div>
<a id="trunkwpadminplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugin-install.php (16220 => 16221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugin-install.php 2010-11-06 00:21:46 UTC (rev 16220)
+++ trunk/wp-admin/plugin-install.php 2010-11-06 09:41:03 UTC (rev 16221)
</span><span class="lines">@@ -5,6 +5,9 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Administration
</span><span class="cx"> */
</span><ins>+// TODO route this pages via a specific iframe handler instead of the do_action below
+if ( isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) )
+ define('IFRAME_REQUEST' , true);
</ins><span class="cx">
</span><span class="cx"> /** WordPress Administration Bootstrap */
</span><span class="cx"> require_once('./admin.php');
</span></span></pre></div>
<a id="trunkwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/press-this.php (16220 => 16221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/press-this.php 2010-11-06 00:21:46 UTC (rev 16220)
+++ trunk/wp-admin/press-this.php 2010-11-06 09:41:03 UTC (rev 16221)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> * @subpackage Press_This
</span><span class="cx"> */
</span><span class="cx">
</span><del>-define('WP_SHOW_ADMIN_BAR' , false);
</del><ins>+define('IFRAME_REQUEST' , true);
</ins><span class="cx">
</span><span class="cx"> /** WordPress Administration Bootstrap */
</span><span class="cx"> require_once('./admin.php');
</span></span></pre></div>
<a id="trunkwpadminupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update.php (16220 => 16221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update.php 2010-11-06 00:21:46 UTC (rev 16220)
+++ trunk/wp-admin/update.php 2010-11-06 09:41:03 UTC (rev 16221)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> * @subpackage Administration
</span><span class="cx"> */
</span><span class="cx">
</span><del>-define('WP_SHOW_ADMIN_BAR' , false);
</del><ins>+define('IFRAME_REQUEST' , true);
</ins><span class="cx">
</span><span class="cx"> /** WordPress Administration Bootstrap */
</span><span class="cx"> require_once('./admin.php');
</span></span></pre></div>
<a id="trunkwpappphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-app.php (16220 => 16221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-app.php 2010-11-06 00:21:46 UTC (rev 16220)
+++ trunk/wp-app.php 2010-11-06 09:41:03 UTC (rev 16221)
</span><span class="lines">@@ -11,7 +11,6 @@
</span><span class="cx"> * @var bool
</span><span class="cx"> */
</span><span class="cx"> define('APP_REQUEST', true);
</span><del>-define('WP_SHOW_ADMIN_BAR' , false);
</del><span class="cx">
</span><span class="cx"> /** Set up WordPress environment */
</span><span class="cx"> require_once('./wp-load.php');
</span></span></pre></div>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (16220 => 16221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2010-11-06 00:21:46 UTC (rev 16220)
+++ trunk/wp-includes/admin-bar.php 2010-11-06 09:41:03 UTC (rev 16221)
</span><span class="lines">@@ -328,13 +328,17 @@
</span><span class="cx"> */
</span><span class="cx"> function is_admin_bar_showing() {
</span><span class="cx"> global $show_admin_bar;
</span><ins>+
+ /* For all these types of request we never want an admin bar period */
+ if ( defined('XMLRPC_REQUEST') || defined('APP_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') )
+ return false;
+
</ins><span class="cx"> if ( ! isset( $show_admin_bar ) || null === $show_admin_bar ) {
</span><del>- $show_admin_bar = true;
-
- if ( defined('WP_SHOW_ADMIN_BAR') )
- $show_admin_bar = (bool) WP_SHOW_ADMIN_BAR;
- else if ( ! is_user_logged_in() || ( is_admin() && ! is_multisite() ) )
</del><ins>+ if ( ! is_user_logged_in() || ( is_admin() && ! is_multisite() ) ) {
</ins><span class="cx"> $show_admin_bar = false;
</span><ins>+ } else {
+ $show_admin_bar = true;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $show_admin_bar = apply_filters( 'show_admin_bar', $show_admin_bar );
</span></span></pre></div>
<a id="trunkxmlrpcphp"></a>
<div class="modfile"><h4>Modified: trunk/xmlrpc.php (16220 => 16221)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/xmlrpc.php 2010-11-06 00:21:46 UTC (rev 16220)
+++ trunk/xmlrpc.php 2010-11-06 09:41:03 UTC (rev 16221)
</span><span class="lines">@@ -11,7 +11,6 @@
</span><span class="cx"> * @var bool
</span><span class="cx"> */
</span><span class="cx"> define('XMLRPC_REQUEST', true);
</span><del>-define('WP_SHOW_ADMIN_BAR' , false);
</del><span class="cx">
</span><span class="cx"> // Some browser-embedded clients send cookies. We don't want them.
</span><span class="cx"> $_COOKIE = array();
</span></span></pre>
</div>
</div>
</body>
</html>