Changeset 3718

Timestamp:

01/29/2012 09:27:29 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Add description to Group Forums Parent setting. Remove check for forums not being active, as this will be handled by migration later. See #1699.

Location:

branches/plugin/bbp-admin

Files:

• bbp-admin.php (modified) (2 diffs)
• bbp-settings.php (modified) (1 diff)

branches/plugin/bbp-admin/bbp-admin.php

@@ -310 +310 @@
         /** BuddyPress ********************************************************/
 
-        if ( is_plugin_active( 'buddypress/bp-loader.php' ) && defined( 'BP_VERSION' ) && !bp_is_active( 'forums' ) ) {
+        if ( is_plugin_active( 'buddypress/bp-loader.php' ) && defined( 'BP_VERSION' ) ) {
 
             // Add the per page section
@@ -317 +317 @@
             // Topics per page setting
             add_settings_field( '_bbp_enable_group_forums',  __( 'Enable Group Forums', 'bbpress' ), 'bbp_admin_setting_callback_group_forums',         'bbpress', 'bbp_buddypress' );
-            register_setting  ( 'bbpress',                  '_bbp_enable_group_forums',                  'intval'                                                                       );
+            register_setting  ( 'bbpress',                  '_bbp_enable_group_forums',              'intval'                                                                       );
 
             // Topics per page setting
-            add_settings_field( '_bbp_group_forums_root_id', __( 'Root Group Forum', 'bbpress' ),    'bbp_admin_setting_callback_group_forums_root_id', 'bbpress', 'bbp_buddypress' );
+            add_settings_field( '_bbp_group_forums_root_id', __( 'Group Forums Parent', 'bbpress' ), 'bbp_admin_setting_callback_group_forums_root_id', 'bbpress', 'bbp_buddypress' );
             register_setting  ( 'bbpress',                  '_bbp_group_forums_root_id',             'intval'                                                                       );
         }

branches/plugin/bbp-admin/bbp-settings.php

@@ -487 +487 @@
 
     <label for="_bbp_group_forums_root_id"><?php _e( 'is the parent for all group forums', 'bbpress' ); ?></label>
+    <p class="description"><?php _e( 'Using the Forum Root is not recommended. Changing this does not move existing forums.', 'bbpress' ); ?></p>
 
 <?php