Changeset 6079

Timestamp:

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

Author:

djpaul

Message:

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

Location:

trunk/bp-core

Files:

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

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

@@ -71 +71 @@
     <input id="_bp_enable_akismet" name="_bp_enable_akismet" type="checkbox" value="1" <?php checked( bp_is_akismet_active( true ) ); ?> />
     <label for="_bp_enable_akismet"><?php _e( 'Allow Akismet to scan for activity stream spam', 'buddypress' ); ?></label>
+
+<?php
+}
+
+/**
+ * Allow activity comments on blog posts and forum posts
+ *
+ * @since BuddyPress (1.6)
+ */
+function bp_admin_setting_callback_blogforum_comments() {
+?>
+
+    <input id="bp-disable-blogforum-comments" name="bp-disable-blogforum-comments" type="checkbox" value="1" <?php checked( bp_disable_blogforum_comments( true ) ); ?> />
+    <label for="bp-disable-blogforum-comments"><?php _e( 'Allow activity stream commenting on blog and forum posts', 'buddypress' ); ?></label>
 
 <?php
@@ -211 +225 @@
             'bp-disable-account-deletion',
             'bp-disable-avatar-uploads',
+            'bp_disable_blogforum_comments',
             'bp-disable-profile-sync',
             'bp_restrict_group_creation',

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'                                                                                  );
+            }
         }