Changeset 5084

Timestamp:

08/21/2013 09:11:47 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Add 'show_none' to forum ID dropdown in form-topic.php template part. Fixes UX problem where a new-topic page would automatically select the first option in the list for topics to go in. Also escape output of 'show_none' in bbp_get_dropdown(). Fixes #2390.

Location:

trunk

Files:

• includes/common/template.php (modified) (1 diff)
• templates/default/bbpress/form-topic.php (modified) (1 diff)

trunk/includes/common/template.php

@@ -1425 +1425 @@
 
             // Get the options
-            $retval .= !empty( $r['show_none'] ) ? "\t<option value=\"\" class=\"level-0\">" . $r['show_none'] . '</option>' : '';
+            $retval .= !empty( $r['show_none'] ) ? "\t<option value=\"\" class=\"level-0\">" . esc_html( $r['show_none'] ) . '</option>' : '';
             $retval .= walk_page_dropdown_tree( $posts, 0, $r );
 

trunk/templates/default/bbpress/form-topic.php

@@ -113 +113 @@
                         <p>
                             <label for="bbp_forum_id"><?php _e( 'Forum:', 'bbpress' ); ?></label><br />
-                            <?php bbp_dropdown( array( 'selected' => bbp_get_form_topic_forum() ) ); ?>
+                            <?php
+                                bbp_dropdown( array(
+                                    'show_none' => __( '(No Forum)', 'bbpress' ),
+                                    'selected'  => bbp_get_form_topic_forum()
+                                ) );
+                            ?>
                         </p>