<!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] [1963] trunk: Fixing &quot;Missing bp-themes&quot;
  error when viewing BuddyPress general settings from another blog other than the root blog
 .</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>1963</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-09-26 08:02:20 +0000 (Sat, 26 Sep 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fixing &quot;Missing bp-themes&quot; error when viewing BuddyPress general settings from another blog other than the root blog.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreadminphp">trunk/bp-core/bp-core-admin.php</a></li>
<li><a href="#trunkbpxprofilebpxprofilecssjsphp">trunk/bp-xprofile/bp-xprofile-cssjs.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoreadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-admin.php (1962 => 1963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-admin.php        2009-09-26 07:57:05 UTC (rev 1962)
+++ trunk/bp-core/bp-core-admin.php        2009-09-26 08:02:20 UTC (rev 1963)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> &lt;?php
</span><span class="cx"> 
</span><span class="cx"> function bp_core_admin_settings() {
</span><del>-        global $wpdb, $bp;
</del><ins>+        global $wpdb, $bp, $current_blog;
</ins><span class="cx"> ?&gt;
</span><span class="cx">         
</span><span class="cx">         &lt;?php
</span><span class="lines">@@ -101,8 +101,8 @@
</span><span class="cx">                                         &lt;/td&gt;                        
</span><span class="cx">                                 &lt;/tr&gt;                                
</span><span class="cx">                                 &lt;?php endif; ?&gt;
</span><del>-                                                        
-                                &lt;?php if ( !locate_template( array( 'registration/register.php' ) ) ) : ?&gt;
</del><ins>+
+                                &lt;?php if ( '' == locate_template( array( 'registration/register.php' ), false ) &amp;&amp; $current_blog-&gt;blog_id == BP_ROOT_BLOG ) : ?&gt;
</ins><span class="cx">                                 &lt;tr&gt;
</span><span class="cx">                                         &lt;th scope=&quot;row&quot;&gt;&lt;?php _e('Select theme to use for BuddyPress generated pages', 'buddypress' ) ?&gt;:&lt;/th&gt;
</span><span class="cx">                                         &lt;td&gt;
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofilecssjsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-cssjs.php (1962 => 1963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-cssjs.php        2009-09-26 07:57:05 UTC (rev 1962)
+++ trunk/bp-xprofile/bp-xprofile-cssjs.php        2009-09-26 08:02:20 UTC (rev 1963)
</span><span class="lines">@@ -13,4 +13,4 @@
</span><span class="cx"> }
</span><span class="cx"> add_action( 'admin_menu', 'xprofile_add_admin_js', 1 );
</span><span class="cx"> 
</span><del>-?&gt;
</del><ins>+?&gt;
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>

</body>
</html>