Changeset 4963

Timestamp:

05/28/2013 05:55:08 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Tweak threaded reply setting to more closely match threaded comments, and add the default settings to the options array. Fixes issue with 0/1 level deep not matching intended behavior. See #2340.

Location:

trunk/includes

Files:

• admin/settings.php (modified) (3 diffs)
• core/options.php (modified) (3 diffs)

trunk/includes/admin/settings.php

@@ -170 +170 @@
                         ),
 
+                        // Allow threadde replies
+                        '_bbp_allow_threaded_replies' => array(
+                                'sanitize_callback' => 'intval',
+                                'args'              => array()
+                        ),
+
                         // Set reply threading level
                         '_bbp_thread_replies_depth' => array(
-                                'title'             => __( 'Thread replies to topics', 'bbpress' ),
+                                'title'             => __( 'Reply Threading', 'bbpress' ),
                                 'callback'          => 'bbp_admin_setting_callback_thread_replies_depth',
                                 'sanitize_callback' => 'intval',
@@ -526 +532 @@
         // Set maximum depth for dropdown
         $max_depth     = (int) apply_filters( 'bbp_thread_replies_depth_max', 10 );
-        $current_depth = bbp_thread_replies_depth(); ?>
+        $current_depth = bbp_thread_replies_depth();
+
+        // Start an output buffer for the select dropdown
+        ob_start(); ?>
 
         <select id="_bbp_thread_replies_depth" name="_bbp_thread_replies_depth">
-        <?php for ( $i = 0; $i <= $max_depth; $i++ ) : ?>
+        <?php for ( $i = 2; $i <= $max_depth; $i++ ) : ?>
 
                 <option value="<?php echo esc_attr( $i ); ?>" <?php selected( $i, $current_depth ); ?>><?php echo esc_html( $i ); ?></option>
@@ -536 +545 @@
         </select>
 
-        <label for="_bbp_thread_replies_depth"><?php esc_html_e( 'levels deep', 'bbpress' ); ?></label>
+        <?php $select = ob_get_clean(); ?>
+
+        <label for="_bbp_allow_threaded_replies">
+                <input name="_bbp_allow_threaded_replies" type="checkbox" id="_bbp_allow_threaded_replies" value="1" <?php checked( '1', bbp_allow_threaded_replies() ); ?> />
+                <?php printf( esc_html__( 'Enable threaded (nested) replies %s levels deep', 'bbpress' ), $select ); ?>
+        </label>
 
 <?php

trunk/includes/core/options.php

@@ -30 +30 @@
                 /** Settings **********************************************************/
 
-                '_bbp_edit_lock'            => 5,                          // Lock post editing after 5 minutes
-                '_bbp_throttle_time'        => 10,                         // Throttle post time to 10 seconds
-                '_bbp_enable_favorites'     => 1,                          // Favorites
-                '_bbp_enable_subscriptions' => 1,                          // Subscriptions
-                '_bbp_allow_anonymous'      => 0,                          // Allow anonymous posting
-                '_bbp_allow_global_access'  => 1,                          // Users from all sites can post
-                '_bbp_allow_revisions'      => 1,                          // Allow revisions
-                '_bbp_allow_topic_tags'     => 1,                          // Topic Tags
-                '_bbp_thread_replies_depth' => 0,                          // Thread replies depth
-                '_bbp_use_wp_editor'        => 1,                          // Use the WordPress editor if available
-                '_bbp_use_autoembed'        => 0,                          // Allow oEmbed in topics and replies
-                '_bbp_theme_package_id'     => 'default',                  // The ID for the current theme package
-                '_bbp_default_role'         => bbp_get_participant_role(), // Default forums role
-                '_bbp_settings_integration' => 0,                          // Put settings into existing admin pages
+                '_bbp_edit_lock'              => 5,                          // Lock post editing after 5 minutes
+                '_bbp_throttle_time'          => 10,                         // Throttle post time to 10 seconds
+                '_bbp_enable_favorites'       => 1,                          // Favorites
+                '_bbp_enable_subscriptions'   => 1,                          // Subscriptions
+                '_bbp_allow_anonymous'        => 0,                          // Allow anonymous posting
+                '_bbp_allow_global_access'    => 1,                          // Users from all sites can post
+                '_bbp_allow_revisions'        => 1,                          // Allow revisions
+                '_bbp_allow_topic_tags'       => 1,                          // Topic Tags
+                '_bbp_allow_threaded_replies' => 0,                          // Allow threaded replies
+                '_bbp_thread_replies_depth'   => 2,                          // Thread replies depth
+                '_bbp_use_wp_editor'          => 1,                          // Use the WordPress editor if available
+                '_bbp_use_autoembed'          => 0,                          // Allow oEmbed in topics and replies
+                '_bbp_theme_package_id'       => 'default',                  // The ID for the current theme package
+                '_bbp_default_role'           => bbp_get_participant_role(), // Default forums role
+                '_bbp_settings_integration'   => 0,                          // Put settings into existing admin pages
 
                 /** Per Page **********************************************************/
@@ -242 +243 @@
 function bbp_thread_replies() {
         $depth  = bbp_thread_replies_depth();
-        $retval = (bool) ( $depth > 1 );
-
-        return (bool) apply_filters( 'bbp_thread_replies', $retval, $depth );
+        $allow  = bbp_allow_threaded_replies();
+        $retval = (bool) ( ( $depth >= 2 ) && ( true === $allow ) );
+
+        return (bool) apply_filters( 'bbp_thread_replies', $retval, $depth, $allow );
+}
+
+/**
+ * Are threaded replies allowed
+ *
+ * @since bbPress (r4964)
+ * @param $default bool Optional. Default value false
+ * @uses get_option() To get the threaded replies setting
+ * @return bool Are threaded replies allowed?
+ */
+function bbp_allow_threaded_replies( $default = 0 ) {
+        return (bool) apply_filters( '_bbp_allow_threaded_replies', (bool) get_option( '_bbp_allow_threaded_replies', $default ) );
 }
 
@@ -258 +272 @@
  * @return int Thread replies depth
  */
-function bbp_thread_replies_depth( $default = 1 ) {
+function bbp_thread_replies_depth( $default = 2 ) {
         return (int) apply_filters( 'bbp_thread_replies_depth', (int) get_option( '_bbp_thread_replies_depth', $default ) );
 }