Ticket #21451: 21451.patch

wp-includes/default-widgets.php

@@ -150 +150 @@
                 <option value=""><?php _ex('All Links', 'links widget'); ?></option>
                 <?php
                 foreach ( $link_cats as $link_cat ) {
-                        echo '<option value="' . intval($link_cat->term_id) . '"'
-                                . ( $link_cat->term_id == $instance['category'] ? ' selected="selected"' : '' )
+                        echo '<option value="' . intval( $link_cat->term_id ) . '"'
+                                . selected( $instance['category'], $link_cat->term_id, false )
                                 . '>' . $link_cat->name . "</option>\n";
                 }
                 ?>
@@ -935 +935 @@
         <select id="rss-items-<?php echo $number; ?>" name="widget-rss[<?php echo $number; ?>][items]">
 <?php
                 for ( $i = 1; $i <= 20; ++$i )
-                        echo "<option value='$i' " . ( $items == $i ? "selected='selected'" : '' ) . ">$i</option>";
+                        echo "<option value='$i' " . selected( $items, $i, false ) . ">$i</option>";
 ?>
         </select></p>
 <?php endif; if ( $inputs['show_summary'] ) : ?>
@@ -1130 +1130 @@
                         <select id="<?php echo $this->get_field_id('nav_menu'); ?>" name="<?php echo $this->get_field_name('nav_menu'); ?>">
                 <?php
                         foreach ( $menus as $menu ) {
-                                $selected = $nav_menu == $menu->term_id ? ' selected="selected"' : '';
-                                echo '<option'. $selected .' value="'. $menu->term_id .'">'. $menu->name .'</option>';
+                                echo '<option value="' . $menu->term_id . '"'
+                                        . selected( $nav_menu, $menu->term_id, false )
+                                        . '>'. $menu->name . '</option>';
                         }
                 ?>
                         </select>