Changeset 6079 for trunk/bp-core/bp-core-admin.php

Timestamp:

06/13/2012 07:35:20 PM (13 years ago)

Author:

djpaul

Message:

Add missing 'activity comments on blog posts and forum posts' settings back to Settings screen. See #4205.

File:

• trunk/bp-core/bp-core-admin.php (modified) (2 diffs)

trunk/bp-core/bp-core-admin.php

@@ -298 +298 @@
             add_settings_section( 'bp_xprofile',      __( 'Profile Settings', 'buddypress' ), 'bp_admin_setting_callback_xprofile_section', 'buddypress'                );
 
-            // Allow topic and reply revisions
+            // Allow avatar uploads
             add_settings_field( 'bp-disable-avatar-uploads', __( 'Avatar Uploads',   'buddypress' ), 'bp_admin_setting_callback_avatar_uploads',   'buddypress', 'bp_xprofile' );
             register_setting  ( 'buddypress',         'bp-disable-avatar-uploads',   'intval'                                                                                  );
@@ -333 +333 @@
         /** Activity Section **************************************************/
 
-        if ( bp_is_active( 'activity' ) && ( is_plugin_active( 'akismet/akismet.php' ) && defined( 'AKISMET_VERSION' ) ) ) {
+        if ( bp_is_active( 'activity' ) ) {
 
             // Add the main section
             add_settings_section( 'bp_activity',      __( 'Activity Settings', 'buddypress' ), 'bp_admin_setting_callback_activity_section', 'buddypress'                );
 
-            // Allow subscriptions setting
-            add_settings_field( '_bp_enable_akismet', __( 'Akismet',          'buddypress' ), 'bp_admin_setting_callback_activity_akismet', 'buddypress', 'bp_activity' );
-            register_setting  ( 'buddypress',         '_bp_enable_akismet',   'intval'                                                                                  );
+            // Activity commenting on blog and forum posts
+            add_settings_field( 'bp-disable-blogforum-comments', __( 'Blog & Forum Comments', 'buddypress' ), 'bp_admin_setting_callback_blogforum_comments', 'buddypress', 'bp_activity' );
+            register_setting( 'buddypress', 'bp-disable-blogforum-comments', 'intval' );
+
+            // Allow activity akismet
+            if ( is_plugin_active( 'akismet/akismet.php' ) && defined( 'AKISMET_VERSION' ) ) {
+                add_settings_field( '_bp_enable_akismet', __( 'Akismet',          'buddypress' ), 'bp_admin_setting_callback_activity_akismet', 'buddypress', 'bp_activity' );
+                register_setting  ( 'buddypress',         '_bp_enable_akismet',   'intval'                                                                                  );
+            }
         }