<!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] [2938] branches/1.2/bp-core: Fixes #2119 props edelwater</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>2938</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-04-19 06:12:40 +0000 (Mon, 19 Apr 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fixes #2119 props edelwater</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpcorebpcoreadminbarphp">branches/1.2/bp-core/bp-core-adminbar.php</a></li>
<li><a href="#branches12bpcorebpcorecssjsphp">branches/1.2/bp-core/bp-core-cssjs.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpcorebpcoreadminbarphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-adminbar.php (2937 => 2938)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-adminbar.php        2010-04-19 06:05:27 UTC (rev 2937)
+++ branches/1.2/bp-core/bp-core-adminbar.php        2010-04-19 06:12:40 UTC (rev 2938)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">         if ( defined( 'BP_DISABLE_ADMIN_BAR' ) )
</span><span class="cx">                 return false;
</span><span class="cx"> 
</span><del>-        if ( (int)$bp-&gt;site_options['hide-loggedout-adminbar'] &amp;&amp; !is_user_logged_in() )
</del><ins>+        if ( (int)get_site_option( 'hide-loggedout-adminbar' ) &amp;&amp; !is_user_logged_in() )
</ins><span class="cx">                 return false;
</span><span class="cx"> 
</span><span class="cx">         $bp-&gt;doing_admin_bar = true;
</span></span></pre></div>
<a id="branches12bpcorebpcorecssjsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-cssjs.php (2937 => 2938)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-cssjs.php        2010-04-19 06:05:27 UTC (rev 2937)
+++ branches/1.2/bp-core/bp-core-cssjs.php        2010-04-19 06:12:40 UTC (rev 2938)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> function bp_core_override_adminbar_css() {
</span><span class="cx">         global $bp;
</span><span class="cx"> 
</span><del>-        if ( defined( 'BP_DISABLE_ADMIN_BAR' ) || ( $bp-&gt;site_options['hide-loggedout-adminbar'] &amp;&amp; !is_user_logged_in() ) ) {
</del><ins>+        if ( defined( 'BP_DISABLE_ADMIN_BAR' ) || ( (int)get_site_option( 'hide-loggedout-adminbar' ) &amp;&amp; !is_user_logged_in() ) ) {
</ins><span class="cx">         ?&gt;
</span><span class="cx"> &lt;style type=&quot;text/css&quot;&gt;body { padding-top: 0 !important; } #wp-admin-bar { display: none; }&lt;/style&gt;
</span><span class="cx">         &lt;?php }
</span></span></pre>
</div>
</div>

</body>
</html>