<!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] [2029] trunk/bp-core/bp-core-admin.php: Fixes #1141</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2029</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-10-02 22:57:45 +0000 (Fri, 02 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1141</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreadminphp">trunk/bp-core/bp-core-admin.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 (2028 => 2029)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-admin.php        2009-10-02 22:41:39 UTC (rev 2028)
+++ trunk/bp-core/bp-core-admin.php        2009-10-02 22:57:45 UTC (rev 2029)
</span><span class="lines">@@ -101,34 +101,34 @@
</span><span class="cx">                                         </td>                        
</span><span class="cx">                                 </tr>                                
</span><span class="cx">                                 <?php endif; ?>
</span><del>-
-                                <?php if ( '' == locate_template( array( 'registration/register.php' ), false ) && $current_blog->blog_id == BP_ROOT_BLOG ) : ?>
-                                <tr>
-                                        <th scope="row"><?php _e('Select theme to use for BuddyPress generated pages', 'buddypress' ) ?>:</th>
-                                        <td>
-                                                <?php $themes = bp_core_get_buddypress_themes() ?>
-                                                <?php if ( $themes ) : ?>
-                                                <select name="bp-admin[active-member-theme]" id="active-member-theme">
-                                                        <?php
-                                                        for ( $i = 0; $i < count($themes); $i++ ) {
-                                                                if ( $themes[$i]['template'] == get_site_option( 'active-member-theme' ) ) {
-                                                                        $selected = ' selected="selected"';
-                                                                } else {
-                                                                        $selected = '';
-                                                                }
-                                                        ?>
-                                                        <option<?php echo $selected ?> value="<?php echo $themes[$i]['template'] ?>"><?php echo $themes[$i]['name'] ?> (<?php echo $themes[$i]['version'] ?>)</option>
-                                                        <?php } ?>
-                                                </select>
-                                                <?php else : ?>
-                                                        <div class="error">
-                                                                <p><?php printf( __( '<strong>You do not have any BuddyPress themes installed.</strong><p style="line-height: 150%%">Please move the default BuddyPress themes to their correct location (move %s to %s) and reload this page. You can <a href="http://buddypress.org/extend/themes" title="Download">download more themes here</a>.</p>', 'buddypress' ), BP_PLUGIN_DIR . '/bp-themes/', WP_CONTENT_DIR . '/bp-themes/' ) ?></p>
-                                                        </div>
-                                                        <p><?php _e( 'No Themes Installed.', 'buddypress' ) ?></p>
-                                                <?php endif; ?>
-                                        </td>                        
-                                </tr>
</del><ins>+                                
+                                <?php $themes = bp_core_get_buddypress_themes() ?>
+                                <?php if ( $themes ) : ?>
+                                        <tr>
+                                                <th scope="row"><?php _e('Select theme to use for BuddyPress generated pages', 'buddypress' ) ?>:</th>
+                                                <td>
+                                                                <select name="bp-admin[active-member-theme]" id="active-member-theme">
+                                                                <?php
+                                                                for ( $i = 0; $i < count($themes); $i++ ) {
+                                                                        if ( $themes[$i]['template'] == get_site_option( 'active-member-theme' ) ) {
+                                                                                $selected = ' selected="selected"';
+                                                                        } else {
+                                                                                $selected = '';
+                                                                        }
+                                                                ?>
+                                                                <option<?php echo $selected ?> value="<?php echo $themes[$i]['template'] ?>"><?php echo $themes[$i]['name'] ?> (<?php echo $themes[$i]['version'] ?>)</option>
+                                                                <?php } ?>
+                                                        </select>
+                                                </td>                        
+                                        </tr>
+                                <?php else : ?>
+                                        <?php if ( '' == locate_template( array( 'registration/register.php' ), false ) && $current_blog->blog_id == BP_ROOT_BLOG ) : ?>
+                                                <div class="error">
+                                                        <p><?php _e( '<strong>Your currently active theme is not BuddyPress enabled.</strong><p style="margin: 2px 0">Visit <a href="http://buddypress.org/extend/themes/">http://buddypress.org/extend/themes/</a> to browse themes that include support for BuddyPress features.</p>', 'buddypress' ) ?></p>
+                                                </div>
+                                        <?php endif; ?>
</ins><span class="cx">                                 <?php endif; ?>
</span><ins>+                                                        
</ins><span class="cx">                                 <tr>
</span><span class="cx">                                         <th scope="row"><?php _e( 'Default User Avatar', 'buddypress' ) ?></th>
</span><span class="cx">                                         <td>
</span></span></pre>
</div>
</div>
</body>
</html>