<!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>[BuddyPress] [2599] trunk/bp-core/bp-core-cssjs.php:
Make sure the admin bar styles from the active theme are loaded in the admin area
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2599</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-04 17:11:17 +0000 (Thu, 04 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure the admin bar styles from the active theme are loaded in the admin area.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorecssjsphp">trunk/bp-core/bp-core-cssjs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorecssjsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-cssjs.php (2598 => 2599)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-cssjs.php 2010-02-04 16:48:18 UTC (rev 2598)
+++ trunk/bp-core/bp-core-cssjs.php 2010-02-04 17:11:17 UTC (rev 2599)
</span><span class="lines">@@ -9,15 +9,12 @@
</span><span class="cx"> * @uses get_option() Selects a site setting from the DB.
</span><span class="cx"> */
</span><span class="cx"> function bp_core_add_admin_bar_css() {
</span><del>- global $bp;
</del><ins>+ global $bp, $current_blog;
</ins><span class="cx">
</span><span class="cx"> if ( defined( 'BP_DISABLE_ADMIN_BAR' ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( !bp_core_is_multisite() )
- return false;
-
- if ( $bp->current_blog != BP_ROOT_BLOG ) {
</del><ins>+ if ( ( bp_core_is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG ) || is_admin() ) {
</ins><span class="cx"> $stylesheet = get_blog_option( BP_ROOT_BLOG, 'stylesheet' );
</span><span class="cx">
</span><span class="cx"> if ( file_exists( WP_CONTENT_DIR . '/themes/' . $stylesheet . '/_inc/css/adminbar.css' ) )
</span></span></pre>
</div>
</div>
</body>
</html>