<!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" />
<title>[BuddyPress][3989] trunk: Switch setting from bp-deactivated-components to bp-active-components.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>3989</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2011-02-02 01:26:28 +0000 (Wed, 02 Feb 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Switch setting from bp-deactivated-components to bp-active-components. Adjust some verbiage on the component settings page. Use smarter logic to show/hide possible directory page assignments based on active components.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcoreadminbpcoreadminphp">trunk/bp-core/admin/bp-core-admin.php</a></li>
<li><a href="#trunkbpcorebpcorebootstrapphp">trunk/bp-core/bp-core-bootstrap.php</a></li>
<li><a href="#trunkbpcorebpcoretemplatephp">trunk/bp-core/bp-core-template.php</a></li>
<li><a href="#trunkbpxprofileadmincssadmindevcss">trunk/bp-xprofile/admin/css/admin.dev.css</a></li>
<li><a href="#trunkbpxprofilebpxprofileadminphp">trunk/bp-xprofile/bp-xprofile-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcoreadminbpcoreadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/admin/bp-core-admin.php (3988 => 3989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/admin/bp-core-admin.php 2011-02-02 00:30:28 UTC (rev 3988)
+++ trunk/bp-core/admin/bp-core-admin.php 2011-02-02 01:26:28 UTC (rev 3989)
</span><span class="lines">@@ -227,19 +227,21 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Settings form submitted, now save the settings. First, set active components
</span><del>- foreach ( (array)$_POST['bp_components'] as $key => $value ) {
- if ( !(int) $value )
- $disabled[$key] = 1;
</del><ins>+ if ( isset( $_POST['bp_components'] ) ) {
+ $bp->active_components = stripslashes_deep( $_POST['bp_components'] );
+ update_site_option( 'bp-active-components', $bp->active_components );
</ins><span class="cx"> }
</span><del>- update_site_option( 'bp-deactivated-components', $disabled );
-
</del><ins>+
</ins><span class="cx"> // Then, update the directory pages
</span><del>- $directory_pages = array();
- foreach ( (array)$_POST['bp_pages'] as $key => $value ) {
- if ( !empty( $value ) )
- $directory_pages[$key] = (int)$value;
</del><ins>+ if ( isset( $_POST['bp_pages'] ) ) {
+ $directory_pages = array();
+ foreach ( (array)$_POST['bp_pages'] as $key => $value ) {
+ if ( !empty( $value ) ) {
+ $directory_pages[$key] = (int)$value;
+ }
+ }
+ bp_core_update_page_meta( $directory_pages );
</ins><span class="cx"> }
</span><del>- bp_core_update_page_meta( $directory_pages );
</del><span class="cx"> } ?>
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="lines">@@ -262,7 +264,6 @@
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>- $disabled_components = get_site_option( 'bp-deactivated-components' );
</del><span class="cx"> bp_core_admin_component_options();
</span><span class="cx"> bp_core_admin_page_options();
</span><span class="cx">
</span><span class="lines">@@ -291,30 +292,34 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_core_admin_component_options() {
</span><span class="cx"> global $bp_wizard;
</span><ins>+
+ $active_components = apply_filters( 'bp_active_components', get_site_option( 'bp-active-components' ) );
</ins><span class="cx">
</span><del>- $disabled_components = apply_filters( 'bp_deactivated_components', get_site_option( 'bp-deactivated-components' ) );
-
</del><span class="cx"> // An array of strings looped over to create component setup markup
</span><span class="cx"> $optional_components = array(
</span><span class="cx"> 'xprofile' => array(
</span><span class="cx"> 'title' => __( 'Extended Profiles', 'buddypress' ),
</span><del>- 'description' => __( 'Fully editable profile fields allow you to define the fields users can fill in to describe themselves. Tailor profile fields to suit your audience.', 'buddypress' )
</del><ins>+ 'description' => __( 'Customize your community with fully editable profile fields that allow your users use to uniquely describe themselves.', 'buddypress' )
</ins><span class="cx"> ),
</span><ins>+ 'settings' => array(
+ 'title' => __( 'Account Settings', 'buddypress' ),
+ 'description' => __( 'Allow your users to modify their account and notification settings directly from within their profiles.', 'buddypress' )
+ ),
</ins><span class="cx"> 'friends' => array(
</span><span class="cx"> 'title' => __( 'Friend Connections', 'buddypress' ),
</span><del>- 'description' => __( 'Let your users make connections so they can track the activity of others, or filter on only those users they care about the most.', 'buddypress' )
</del><ins>+ 'description' => __( 'Let your users make connections so they can track the activity of others and focus on the people they care about the most.', 'buddypress' )
</ins><span class="cx"> ),
</span><span class="cx"> 'messages' => array(
</span><span class="cx"> 'title' => __( 'Private Messaging', 'buddypress' ),
</span><del>- 'description' => __( 'Private messaging will allow your users to talk to each other directly, and in private. Not just limited to one on one discussions, your users can send messages to multiple recipients.', 'buddypress' )
</del><ins>+ 'description' => __( 'Allow your users to talk to each other directly and in private. They are not just limited to one-on-one discussions, and can send messages to multiple recipients.', 'buddypress' )
</ins><span class="cx"> ),
</span><span class="cx"> 'activity' => array(
</span><span class="cx"> 'title' => __( 'Activity Streams', 'buddypress' ),
</span><del>- 'description' => __( 'Global, personal and group activity streams with threaded commenting, direct posting, favoriting and @mentions. All with full RSS feed and email notification support.', 'buddypress' )
</del><ins>+ 'description' => __( 'Global, personal, and group activity streams with threaded commenting, direct posting, favoriting and @mentions, all with full RSS feed and email notification support.', 'buddypress' )
</ins><span class="cx"> ),
</span><span class="cx"> 'groups' => array(
</span><del>- 'title' => __( 'Extensible Groups', 'buddypress' ),
- 'description' => __( 'Powerful public, private or hidden groups allow your users to break the discussion down into specific topics with a separate activity stream and member listing.', 'buddypress' )
</del><ins>+ 'title' => __( 'User Groups', 'buddypress' ),
+ 'description' => __( 'Groups allow your users to organize themselves into specific public, private or hidden sections with a separate activity stream and member listing.', 'buddypress' )
</ins><span class="cx"> ),
</span><span class="cx"> 'forums' => array(
</span><span class="cx"> 'title' => __( 'Discussion Forums', 'buddypress' ),
</span><span class="lines">@@ -349,8 +354,8 @@
</span><span class="cx"> <th scope="row"><?php echo esc_html( $labels['title'] ); ?></th>
</span><span class="cx">
</span><span class="cx"> <td>
</span><del>- <label for="bp_components[bp-<?php echo esc_attr( $name ); ?>.php]">
- <input type="checkbox" name="bp_components[bp-<?php echo esc_attr( $name ); ?>.php]" value="1"<?php if ( !isset( $disabled_components['bp-' . esc_attr( $name ) . '.php'] ) ) : ?> checked="checked"<?php endif ?> />
</del><ins>+ <label for="bp_components[<?php echo esc_attr( $name ); ?>]">
+ <input type="checkbox" name="bp_components[<?php echo esc_attr( $name ); ?>]" value="1"<?php checked( isset( $active_components[esc_attr( $name )] ) ); ?> />
</ins><span class="cx">
</span><span class="cx"> <?php echo esc_html( $labels['description'] ); ?>
</span><span class="cx">
</span><span class="lines">@@ -361,16 +366,13 @@
</span><span class="cx">
</span><span class="cx"> <?php endforeach ?>
</span><span class="cx">
</span><ins>+ <?php do_action( 'bp_active_external_components' ); ?>
+
</ins><span class="cx"> </tbody>
</span><span class="cx"> </table>
</span><span class="cx">
</span><del>- <?php /* Make sure that the blogs component is deactivated when multisite is shut off */ ?>
- <?php if ( !is_multisite() ) : ?>
</del><ins>+ <input type="hidden" name="bp_components[members]" value="1" />
</ins><span class="cx">
</span><del>- <input type="hidden" name="bp_components[bp-blogs.php]" value="0" />
-
- <?php endif ?>
-
</del><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -386,31 +388,70 @@
</span><span class="cx"> function bp_core_admin_page_options() {
</span><span class="cx"> // Get the existing WP pages
</span><span class="cx"> $existing_pages = bp_core_get_page_meta();
</span><del>-
</del><ins>+
</ins><span class="cx"> // An array of strings looped over to create component setup markup
</span><span class="cx"> $directory_pages = array(
</span><del>- 'groups' => __( 'Groups Directory', 'buddypress' ),
- 'forums' => __( 'Forums Directory', 'buddypress' ),
- 'members' => __( 'Members Directory', 'buddypress' ),
- 'activity' => __( 'Activity', 'buddypress' ),
- 'register' => __( 'Register', 'buddypress' ),
- 'activate' => __( 'Activate', 'buddypress' )
</del><ins>+ 'members' => __( 'Members Directory', 'buddypress' ),
+ 'activity' => __( 'Activity Directory', 'buddypress' ),
+ 'groups' => __( 'Groups Directory', 'buddypress' ),
+ 'forums' => __( 'Forums Directory', 'buddypress' ),
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( is_multisite() )
</span><span class="cx"> $directory_pages['blogs'] = __( "Blogs Directory", 'buddypress' ); ?>
</span><span class="cx">
</span><del>- <h3><?php _e( 'Page Setup', 'buddypress' ); ?></h3>
</del><ins>+ <h3><?php _e( 'Directory Pages', 'buddypress' ); ?></h3>
</ins><span class="cx">
</span><del>- <p><?php _e( 'Choose the WordPress pages you would like to associate with the following BuddyPress content.', 'buddypress' ); ?></p>
-
- <p><?php _e( 'Leaving any of these items unset makes that content inaccessible to visitors, so be sure to fill this section out carefully.', 'buddypress' ); ?></p>
-
</del><ins>+ <p><?php _e( 'Choose a WordPress Page to associate with each BuddyPress component directory. Setting to "None" will render that page inaccessible.', 'buddypress' ); ?></p>
+
</ins><span class="cx"> <table class="form-table">
</span><span class="cx"> <tbody>
</span><span class="cx">
</span><span class="cx"> <?php foreach ( $directory_pages as $name => $label ) : ?>
</span><span class="cx">
</span><ins>+ <?php if ( bp_is_active( $name ) ) : ?>
+
+ <tr valign="top">
+ <th scope="row">
+ <label for="bp_pages[<?php echo esc_attr( $name ) ?>]"><?php echo esc_html( $label ) ?></label>
+ </th>
+
+ <td>
+ <?php echo wp_dropdown_pages( array(
+ 'name' => 'bp_pages[' . esc_attr( $name ) . ']',
+ 'echo' => false,
+ 'show_option_none' => __( '- None -', 'buddypress' ),
+ 'selected' => !empty( $existing_pages[$name] ) ? $existing_pages[$name] : false
+ ) ) ?>
+ </td>
+ </tr>
+
+ <?php endif; ?>
+
+ <?php endforeach ?>
+
+ <?php do_action( 'bp_active_external_directories' ); ?>
+
+ </tbody>
+ </table>
+
+ <?php
+
+ // Static pages
+ $static_pages = array(
+ 'register' => __( 'Sign up Page', 'buddypress' ),
+ 'activate' => __( 'Activation Page', 'buddypress' ),
+ ); ?>
+
+ <h3><?php _e( 'Other Pages', 'buddypress' ); ?></h3>
+
+ <p><?php _e( 'Associate WordPress Pages with the following BuddyPress pages. Setting to "None" will render that page inaccessible.', 'buddypress' ); ?></p>
+
+ <table class="form-table">
+ <tbody>
+
+ <?php foreach ( $static_pages as $name => $label ) : ?>
+
</ins><span class="cx"> <tr valign="top">
</span><span class="cx"> <th scope="row">
</span><span class="cx"> <label for="bp_pages[<?php echo esc_attr( $name ) ?>]"><?php echo esc_html( $label ) ?></label>
</span><span class="lines">@@ -428,9 +469,11 @@
</span><span class="cx">
</span><span class="cx"> <?php endforeach ?>
</span><span class="cx">
</span><ins>+ <?php do_action( 'bp_active_external_pages' ); ?>
+
</ins><span class="cx"> </tbody>
</span><span class="cx"> </table>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpcorebpcorebootstrapphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-bootstrap.php (3988 => 3989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-bootstrap.php 2011-02-02 00:30:28 UTC (rev 3988)
+++ trunk/bp-core/bp-core-bootstrap.php 2011-02-02 01:26:28 UTC (rev 3989)
</span><span class="lines">@@ -28,38 +28,38 @@
</span><span class="cx"> do_action( 'bp_core_loaded' );
</span><span class="cx">
</span><span class="cx"> // Get a list of deactivated components
</span><del>- $bp_deactivated = apply_filters( 'bp_deactivated_components', get_site_option( 'bp-deactivated-components' ) );
</del><ins>+ $bp->active_components = apply_filters( 'bp_active_components', get_site_option( 'bp-active-components' ) );
</ins><span class="cx">
</span><span class="cx"> // Activity Streams
</span><del>- if ( !isset( $bp_deactivated['bp-activity/bp-activity-loader.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-activity/bp-activity-loader.php') )
</del><ins>+ if ( bp_is_active( 'activity') && file_exists( BP_PLUGIN_DIR . '/bp-activity/bp-activity-loader.php') )
</ins><span class="cx"> include( BP_PLUGIN_DIR . '/bp-activity/bp-activity-loader.php' );
</span><span class="cx">
</span><span class="cx"> // Blog Tracking
</span><del>- if ( !isset( $bp_deactivated['bp-blogs/bp-blogs-loader.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-blogs/bp-blogs-loader.php') )
</del><ins>+ if ( bp_is_active( 'blogs') && file_exists( BP_PLUGIN_DIR . '/bp-blogs/bp-blogs-loader.php') )
</ins><span class="cx"> include( BP_PLUGIN_DIR . '/bp-blogs/bp-blogs-loader.php' );
</span><span class="cx">
</span><span class="cx"> // bbPress Forum Integration
</span><del>- if ( !isset( $bp_deactivated['bp-forums/bp-forums-loader.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-forums/bp-forums-loader.php') )
</del><ins>+ if ( bp_is_active( 'forums') && file_exists( BP_PLUGIN_DIR . '/bp-forums/bp-forums-loader.php') )
</ins><span class="cx"> include( BP_PLUGIN_DIR . '/bp-forums/bp-forums-loader.php' );
</span><span class="cx">
</span><span class="cx"> // Friend Connections
</span><del>- if ( !isset( $bp_deactivated['bp-friends/bp-friends-loader.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-friends/bp-friends-loader.php') )
</del><ins>+ if ( bp_is_active( 'friends') && file_exists( BP_PLUGIN_DIR . '/bp-friends/bp-friends-loader.php') )
</ins><span class="cx"> include( BP_PLUGIN_DIR . '/bp-friends/bp-friends-loader.php' );
</span><span class="cx">
</span><span class="cx"> // Groups Support
</span><del>- if ( !isset( $bp_deactivated['bp-groups/bp-groups-loader.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-groups/bp-groups-loader.php') )
</del><ins>+ if ( bp_is_active( 'groups') && file_exists( BP_PLUGIN_DIR . '/bp-groups/bp-groups-loader.php') )
</ins><span class="cx"> include( BP_PLUGIN_DIR . '/bp-groups/bp-groups-loader.php' );
</span><span class="cx">
</span><span class="cx"> // Private Messaging
</span><del>- if ( !isset( $bp_deactivated['bp-messages/bp-messages-loader.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-messages/bp-messages-loader.php') )
</del><ins>+ if ( bp_is_active( 'messages') && file_exists( BP_PLUGIN_DIR . '/bp-messages/bp-messages-loader.php') )
</ins><span class="cx"> include( BP_PLUGIN_DIR . '/bp-messages/bp-messages-loader.php' );
</span><span class="cx">
</span><span class="cx"> // Extended Profiles
</span><del>- if ( !isset( $bp_deactivated['bp-xprofile/bp-xprofile-loader.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-loader.php') )
</del><ins>+ if ( bp_is_active( 'xprofile') && file_exists( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-loader.php') )
</ins><span class="cx"> include( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-loader.php' );
</span><span class="cx">
</span><span class="cx"> // Member Settings
</span><del>- if ( !isset( $bp_deactivated['bp-settings/bp-settings-loader.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-settings/bp-settings-loader.php') )
</del><ins>+ if ( bp_is_active( 'settings') && file_exists( BP_PLUGIN_DIR . '/bp-settings/bp-settings-loader.php') )
</ins><span class="cx"> include( BP_PLUGIN_DIR . '/bp-settings/bp-settings-loader.php' );
</span><span class="cx">
</span><span class="cx"> // Always require BuddyPress Members - It cannot be turned off (yet)
</span></span></pre></div>
<a id="trunkbpcorebpcoretemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-template.php (3988 => 3989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-template.php 2011-02-02 00:30:28 UTC (rev 3988)
+++ trunk/bp-core/bp-core-template.php 2011-02-02 01:26:28 UTC (rev 3989)
</span><span class="lines">@@ -857,9 +857,9 @@
</span><span class="cx"> /** Components ****************************************************************/
</span><span class="cx">
</span><span class="cx"> function bp_is_active( $component ) {
</span><del>- global $bp_deactivated;
</del><ins>+ global $bp;
</ins><span class="cx">
</span><del>- if ( !isset( $bp_deactivated[ 'bp-' . $component . '/bp-' . $component . '-loader.php' ] ) )
</del><ins>+ if ( isset( $bp->active_components[$component] ) )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkbpxprofileadmincssadmindevcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/admin/css/admin.dev.css (3988 => 3989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/admin/css/admin.dev.css 2011-02-02 00:30:28 UTC (rev 3988)
+++ trunk/bp-xprofile/admin/css/admin.dev.css 2011-02-02 01:26:28 UTC (rev 3989)
</span><span class="lines">@@ -121,7 +121,6 @@
</span><span class="cx"> margin-left: 10px;
</span><span class="cx"> }
</span><span class="cx"> .field-group div.actions {
</span><del>- display: none;
</del><span class="cx"> position: absolute;
</span><span class="cx"> right: 20px;
</span><span class="cx"> top: 0;
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-admin.php (3988 => 3989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-admin.php 2011-02-02 00:30:28 UTC (rev 3988)
+++ trunk/bp-xprofile/bp-xprofile-admin.php 2011-02-02 01:26:28 UTC (rev 3989)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> if ( !empty( $groups ) ) :
</span><span class="cx"> foreach ( $groups as $group ) { ?>
</span><span class="cx">
</span><del>- <li id="group_<?php echo $group->id; ?>"><a href="#tabs-<?php echo $group->id; ?>" class="ui-tab"><?php echo esc_attr( $group->name ); ?><?php if ( !$group->can_delete ) : ?> <?php _e( '(Core)', 'buddypress'); endif; ?></a></li>
</del><ins>+ <li id="group_<?php echo $group->id; ?>"><a href="#tabs-<?php echo $group->id; ?>" class="ui-tab"><?php echo esc_attr( $group->name ); ?><?php if ( !$group->can_delete ) : ?> <?php _e( '(Primary)', 'buddypress'); endif; ?></a></li>
</ins><span class="cx">
</span><span class="cx"> <?php }
</span><span class="cx"> endif; ?>
</span><span class="lines">@@ -360,7 +360,7 @@
</span><span class="cx"> $field = $admin_field; ?>
</span><span class="cx">
</span><span class="cx"> <fieldset id="field_<?php echo esc_attr( $field->id ); ?>" class="sortable<?php echo ' ' . $field->type; if ( $class ) echo ' ' . $class; ?>">
</span><del>- <legend><?php bp_the_profile_field_name(); ?> <?php if( !$field->can_delete ) : ?> <?php _e( '(Core)', 'buddypress' ); endif; ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(required)', 'buddypress' ) ?><?php endif; ?></legend>
</del><ins>+ <legend><?php bp_the_profile_field_name(); ?> <?php if( !$field->can_delete ) : ?> <?php _e( '(Primary)', 'buddypress' ); endif; ?> <?php if ( bp_get_the_profile_field_is_required() ) : ?><?php _e( '(Required)', 'buddypress' ) ?><?php endif; ?></legend>
</ins><span class="cx"> <div class="field-wrapper">
</span><span class="cx">
</span><span class="cx"> <?php
</span></span></pre>
</div>
</div>
</body>
</html>