Changeset 5394

Timestamp:

06/12/2014 09:36:00 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Smarter ancestor detection in BBP_Walker_Reply_Dropdown. See #2617.

File:

• trunk/src/includes/common/classes.php (modified) (2 diffs)

trunk/src/includes/common/classes.php

@@ -502 +502 @@
         $depth++;
 
-        // Get reply ancestors
-        $to_check = bbp_get_reply_ancestors( $object->ID );
-
-        // Array of ancestors to check for disabling
-        if ( $args['selected'] !== $object->ID ) {
-            array_unshift( $to_check, $object->ID );
-        }
+        // Get ancestors to determine which items to disable
+        $ancestors = bbp_get_reply_ancestors( $object->ID );
+        array_push( $ancestors, $object->ID );
 
         // Determine the indentation
@@ -525 +521 @@
         ob_start(); ?>
 
-        <option class="<?php echo esc_attr( $class ); ?>" value="<?php echo esc_attr( $value ); ?>"<?php selected( $args['selected'], $object->ID ); ?> <?php disabled( in_array( $args['selected'], $to_check ), true ); ?>><?php echo $pad . esc_html( $title ); ?></option>
+        <option class="<?php echo esc_attr( $class ); ?>" value="<?php echo esc_attr( $value ); ?>"<?php selected( $args['selected'], $object->ID ); ?> <?php disabled( in_array( bbp_get_reply_id(), $ancestors ), true ); ?>><?php echo $pad . esc_html( $title ); ?></option>
         
         <?php