Changeset 5398

Timestamp:

06/14/2014 08:20:06 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Update admin area reply-to to use bbp_reply_to_dropdown(). Fixes #2617.

Location:

trunk/src/includes

Files:

• admin/css/admin.css (modified) (1 diff)
• admin/metaboxes.php (modified) (2 diffs)
• common/classes.php (modified) (2 diffs)

trunk/src/includes/admin/css/admin.css

@@ -3 +3 @@
 #poststuff #bbp_forum_attributes select#parent_id,
 #poststuff #bbp_topic_attributes select#parent_id,
-#poststuff #bbp_reply_attributes select#bbp_forum_id {
+#poststuff #bbp_reply_attributes select#bbp_forum_id,
+#poststuff #bbp_reply_attributes select#bbp_reply_to {
     max-width: 170px;
 }

trunk/src/includes/admin/metaboxes.php

@@ -471 +471 @@
     $reply_topic_id = bbp_get_reply_topic_id( $post_id );
     $reply_forum_id = bbp_get_reply_forum_id( $post_id );
-    $reply_to       = bbp_get_reply_to(       $post_id );
 
     // Allow individual manipulation of reply forum
@@ -509 +508 @@
         <strong class="label"><?php esc_html_e( 'Reply To:', 'bbpress' ); ?></strong>
         <label class="screen-reader-text" for="bbp_reply_to"><?php esc_html_e( 'Reply To', 'bbpress' ); ?></label>
-        <input name="bbp_reply_to" id="bbp_reply_to" type="text" value="<?php echo esc_attr( $reply_to ); ?>" />
+        <?php bbp_reply_to_dropdown( $post_id ); ?>
     </p>
 

trunk/src/includes/common/classes.php

@@ -502 +502 @@
         $depth++;
 
+        // Get the reply ID
+        if ( isset( $args['exclude'][0] ) ) {
+            $reply_id = (int) $args['exclude'][0];
+        } else {
+            $reply_id = bbp_get_reply_id();
+        }
+
         // Get ancestors to determine which items to disable
         $ancestors = bbp_get_reply_ancestors( $object->ID );
@@ -521 +528 @@
         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( bbp_get_reply_id(), $ancestors ), 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( $reply_id, $ancestors ), true ); ?>><?php echo $pad . esc_html( $title ); ?></option>
         
         <?php