Changeset 18010

Timestamp:

05/23/2011 11:33:30 PM (15 years ago)

Author:

ryan

Message:

Validation fixes. Props ocean90, peaceablewhale. see #17364

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/custom-background.php (modified) (2 diffs)
• wp-admin/custom-header.php (modified) (1 diff)
• wp-admin/edit-tags.php (modified) (2 diffs)
• wp-admin/export.php (modified) (1 diff)
• wp-admin/includes/class-wp-posts-list-table.php (modified) (1 diff)
• wp-admin/includes/class-wp-terms-list-table.php (modified) (3 diffs)
• wp-admin/includes/class-wp-users-list-table.php (modified) (1 diff)
• wp-admin/includes/dashboard.php (modified) (1 diff)
• wp-admin/includes/nav-menu.php (modified) (3 diffs)
• wp-admin/includes/widgets.php (modified) (1 diff)
• wp-admin/nav-menus.php (modified) (2 diffs)
• wp-admin/network/site-users.php (modified) (2 diffs)
• wp-admin/options-writing.php (modified) (1 diff)
• wp-admin/themes.php (modified) (2 diffs)
• wp-content/themes/twentyeleven/inc/theme-options.php (modified) (3 diffs)

trunk/wp-admin/admin-ajax.php

@@ -509 +509 @@
         break;
 case 'add-tag' :
-        check_ajax_referer( 'add-tag' );
+        check_ajax_referer( 'add-tag', '_wpnonce_add-tag' );
         $post_type = !empty($_POST['post_type']) ? $_POST['post_type'] : 'post';
         $taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';

trunk/wp-admin/custom-background.php

@@ -238 +238 @@
 <?php wp_nonce_field('custom-background-upload', '_wpnonce-custom-background-upload') ?>
 <?php submit_button( __( 'Upload' ), 'button', 'submit', false ); ?>
-</p>
 </form>
 </td>
@@ -271 +270 @@
 <th scope="row"><?php _e( 'Repeat' ); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Background Repeat' ); ?></span></legend>
-<label><input type="radio" name="background-repeat" value="no-repeat"<?php checked('no-repeat', get_theme_mod('background_repeat', 'repeat')); ?>> <?php _e('No Repeat'); ?></option></label>
-        <label><input type="radio" name="background-repeat" value="repeat"<?php checked('repeat', get_theme_mod('background_repeat', 'repeat')); ?>> <?php _e('Tile'); ?></option></label>
-        <label><input type="radio" name="background-repeat" value="repeat-x"<?php checked('repeat-x', get_theme_mod('background_repeat', 'repeat')); ?>> <?php _e('Tile Horizontally'); ?></option></label>
-        <label><input type="radio" name="background-repeat" value="repeat-y"<?php checked('repeat-y', get_theme_mod('background_repeat', 'repeat')); ?>> <?php _e('Tile Vertically'); ?></option></label>
+<label><input type="radio" name="background-repeat" value="no-repeat"<?php checked('no-repeat', get_theme_mod('background_repeat', 'repeat')); ?> /> <?php _e('No Repeat'); ?></label>
+        <label><input type="radio" name="background-repeat" value="repeat"<?php checked('repeat', get_theme_mod('background_repeat', 'repeat')); ?> /> <?php _e('Tile'); ?></label>
+        <label><input type="radio" name="background-repeat" value="repeat-x"<?php checked('repeat-x', get_theme_mod('background_repeat', 'repeat')); ?> /> <?php _e('Tile Horizontally'); ?></label>
+        <label><input type="radio" name="background-repeat" value="repeat-y"<?php checked('repeat-y', get_theme_mod('background_repeat', 'repeat')); ?> /> <?php _e('Tile Vertically'); ?></label>
 </fieldset></td>
 </tr>

trunk/wp-admin/custom-header.php

@@ -389 +389 @@
                 toggle_text();
                 <?php } ?>
-                });
+        });
+/* ]]> */
 </script>
 <?php

trunk/wp-admin/edit-tags.php

@@ -35 +35 @@
 case 'add-tag':
 
-        check_admin_referer( 'add-tag' );
+        check_admin_referer( 'add-tag', '_wpnonce_add-tag' );
 
         if ( !current_user_can( $tax->cap->edit_terms ) )
@@ -329 +329 @@
 <input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
 <input type="hidden" name="post_type" value="<?php echo esc_attr($post_type); ?>" />
-<?php wp_nonce_field('add-tag'); ?>
+<?php wp_nonce_field('add-tag', '_wpnonce_add-tag'); ?>
 
 <div class="form-field form-required">

trunk/wp-admin/export.php

@@ -110 +110 @@
 
                 $month = zeroise( $date->month, 2 );
-                echo '<option value="' . $date->year . '-' . $month . '" />' . $wp_locale->get_month( $month ) . ' ' . $date->year . '</option>';
+                echo '<option value="' . $date->year . '-' . $month . '">' . $wp_locale->get_month( $month ) . ' ' . $date->year . '</option>';
         }
 }

trunk/wp-admin/includes/class-wp-posts-list-table.php

@@ -282 +282 @@
                 $post_status = !empty( $_REQUEST['post_status'] ) ? $_REQUEST['post_status'] : 'all';
                 if ( post_type_supports( $post_type, 'comments' ) && !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) )
-                        $posts_columns['comments'] = '<div class="vers"><img alt="' . esc_attr__( 'Comments' ) . '" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></div>';
+                        $posts_columns['comments'] = '<span class="vers"><img alt="' . esc_attr__( 'Comments' ) . '" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></span>';
 
                 $posts_columns['date'] = __( 'Date' );

trunk/wp-admin/includes/class-wp-terms-list-table.php

@@ -251 +251 @@
                 $name = apply_filters( 'term_name', $pad . ' ' . $tag->name, $tag );
                 $qe_data = get_term( $tag->term_id, $taxonomy, OBJECT, 'edit' );
-                $edit_link = get_edit_term_link( $tag->term_id, $taxonomy, $post_type );
+                $edit_link = esc_url( get_edit_term_link( $tag->term_id, $taxonomy, $post_type ) );
 
                 $out = '<strong><a class="row-title" href="' . $edit_link . '" title="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $name ) ) . '">' . $name . '</a></strong><br />';
@@ -270 +270 @@
                 $out .= '<div class="name">' . $qe_data->name . '</div>';
                 $out .= '<div class="slug">' . apply_filters( 'editable_slug', $qe_data->slug ) . '</div>';
-                $out .= '<div class="parent">' . $qe_data->parent . '</div></div></td>';
+                $out .= '<div class="parent">' . $qe_data->parent . '</div></div>';
 
                 return $out;
@@ -301 +301 @@
                 $args['post_type'] = $post_type;
 
-                return "<a href='" . add_query_arg( $args, 'edit.php' ) . "'>$count</a>";
+                return "<a href='" . esc_url ( add_query_arg( $args, 'edit.php' ) ) . "'>$count</a>";
         }
 

trunk/wp-admin/includes/class-wp-users-list-table.php

@@ -113 +113 @@
                         /* translators: User role name with count */
                         $name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, $avail_roles[$this_role] );
-                        $role_links[$this_role] = "<a href='" . add_query_arg( 'role', $this_role, $url ) . "'$class>$name</a>";
+                        $role_links[$this_role] = "<a href='" . esc_html( add_query_arg( 'role', $this_role, $url ) ) . "'$class>$name</a>";
                 }
 

trunk/wp-admin/includes/dashboard.php

@@ -553 +553 @@
                         <span id="publishing-action">
                                 <input type="submit" name="publish" id="publish" accesskey="p" tabindex="5" class="button-primary" value="<?php current_user_can('publish_posts') ? esc_attr_e('Publish') : esc_attr_e('Submit for Review'); ?>" />
-                                <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" />
+                                <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
                         </span>
                         <br class="clear" />

trunk/wp-admin/includes/nav-menu.php

@@ -183 +183 @@
                                                 ),
                                                 'delete-menu_item_' . $item_id
-                                        ); ?>"><?php _e('Remove'); ?></a> <span class="meta-sep"> | </span> <a class="item-cancel submitcancel" id="cancel-<?php echo $item_id; ?>" href="<?php echo add_query_arg( array('edit-menu-item' => $item_id, 'cancel' => time()), remove_query_arg( $removed_args, admin_url( 'nav-menus.php' ) ) );
+                                        ); ?>"><?php _e('Remove'); ?></a> <span class="meta-sep"> | </span> <a class="item-cancel submitcancel" id="cancel-<?php echo $item_id; ?>" href="<?php echo esc_url( add_query_arg( array('edit-menu-item' => $item_id, 'cancel' => time()), remove_query_arg( $removed_args, admin_url( 'nav-menus.php' ) ) ) );
                                                 ?>#menu-item-settings-<?php echo $item_id; ?>"><?php _e('Cancel'); ?></a>
                                 </div>
@@ -691 +691 @@
                                 <input type="text" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" />
                                 <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
-                                <?php submit_button( __( 'Search' ), 'quick-search-submit button-secondary hide-if-js', 'submit', false ); ?>
+                                <?php submit_button( __( 'Search' ), 'quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-posttype-' . $post_type_name ) ); ?>
                         </p>
 
@@ -925 +925 @@
                                 <input type="text" class="quick-search input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
                                 <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
-                                <?php submit_button( __( 'Search' ), 'quick-search-submit button-secondary hide-if-js', 'submit', false ); ?>
+                                <?php submit_button( __( 'Search' ), 'quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' => 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?>
                         </p>
 

trunk/wp-admin/includes/widgets.php

@@ -208 +208 @@
                 </div>
                 <div class="alignright<?php if ( 'noform' === $has_form ) echo ' widget-control-noform'; ?>">
-                <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-feedback " title="" alt="" />
-                <?php submit_button( __( 'Save' ), 'button-primary widget-control-save', 'savewidget', false ); ?>
+                <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-feedback" title="" alt="" />
+                <?php submit_button( __( 'Save' ), 'button-primary widget-control-save', 'savewidget', false, array( 'id' => 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?>
                 </div>
                 <br class="clear" />

trunk/wp-admin/nav-menus.php

@@ -557 +557 @@
                                                                 <br class="clear" />
                                                                 <div class="publishing-action">
-                                                                        <?php submit_button( empty( $nav_menu_selected_id ) ? __( 'Create Menu' ) : __( 'Save Menu' ), 'button-primary menu-save', 'save_menu', false ); ?>
+                                                                        <?php submit_button( empty( $nav_menu_selected_id ) ? __( 'Create Menu' ) : __( 'Save Menu' ), 'button-primary menu-save', 'save_menu', false, array( 'id' => 'save_menu_header' ) ); ?>
                                                                 </div><!-- END .publishing-action -->
 
@@ -596 +596 @@
                                                         <?php
                                                         if ( ! empty( $nav_menu_selected_id ) )
-                                                                submit_button( __( 'Save Menu' ), 'button-primary menu-save', 'save_menu', false );
+                                                                submit_button( __( 'Save Menu' ), 'button-primary menu-save', 'save_menu', false, array( 'id' => 'save_menu_footer' ) );
                                                         ?>
                                                 </div>

trunk/wp-admin/network/site-users.php

@@ -265 +265 @@
         </table>
         <?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?>
-        <?php submit_button( __('Add User'), 'primary', 'add-user' ); ?>
+        <?php submit_button( __('Add User'), 'primary', 'add-user', false, array( 'id' => 'submit-add-existing-user' ) ); ?>
 </form>
 <?php endif; ?>
@@ -301 +301 @@
         </table>
         <?php wp_nonce_field( 'add-user', '_wpnonce_add-new-user' ) ?>
-        <?php submit_button( __('Add New User'), 'primary', 'add-user' ); ?>
+        <?php submit_button( __('Add New User'), 'primary', 'add-user', false, array( 'id' => 'submit-add-user' ) ); ?>
 </form>
 <?php endif; ?>

trunk/wp-admin/options-writing.php

@@ -70 +70 @@
                 <option<?php selected( get_option('default_post_format'), $format ); ?> value="<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></option>
 <?php endforeach; ?>
-        </select></label>
+        </select>
 </td>
 </tr>

trunk/wp-admin/themes.php

@@ -150 +150 @@
         <label class="screen-reader-text" for="theme-search-input"><?php _e('Search Installed Themes'); ?>:</label>
         <input type="text" id="theme-search-input" name="s" value="<?php _admin_search_query(); ?>" />
-        <?php submit_button( __( 'Search Installed Themes' ), 'button', 'submit', false ); ?>
+        <?php submit_button( __( 'Search Installed Themes' ), 'button', false, false, array( 'id' => 'search-submit' ) ); ?>
         <a id="filter-click" href="?filter=1"><?php _e( 'Feature Filter' ); ?></a>
 </p>
@@ -185 +185 @@
 
         <div class="feature-container">
-                <?php submit_button( __( 'Apply Filters' ), 'button-secondary submitter', 'submit', false, array( 'style' => 'margin-left: 120px' ) ); ?>
+                <?php submit_button( __( 'Apply Filters' ), 'button-secondary submitter', false, false, array( 'style' => 'margin-left: 120px', 'id' => 'filter-submit' ) ); ?>
                 &nbsp;
                 <small><a id="mini-filter-click" href="<?php echo esc_url( remove_query_arg( array('filter', 'features', 'submit') ) ); ?>"><?php _e( 'Close filters' )?></a></small>

trunk/wp-content/themes/twentyeleven/inc/theme-options.php

@@ -196 +196 @@
                                                                         <input type="radio" name="twentyeleven_theme_options[color_scheme]" value="<?php echo esc_attr( $color['value'] ); ?>" <?php checked( $options['color_scheme'], $color['value'] ); ?> />
                                                                         <span>
-                                                                                <img src="<?php echo esc_url( $color['thumbnail'] ); ?>"/>
+                                                                                <img src="<?php echo esc_url( $color['thumbnail'] ); ?>" alt=""/>
                                                                                 <?php echo $color['label']; ?>
                                                                         </span>
@@ -213 +213 @@
                                                         <input type="text" name="twentyeleven_theme_options[link_color]" id="link-color" value="<?php echo esc_attr( $options['link_color'] ); ?>" />
                                                         <a href="#" class="pickcolor hide-if-no-js" id="link-color-example"></a>
-                                                        <input type="button" class="pickcolor button hide-if-no-js" value="<?php esc_attr_e( 'Select a Color', 'twentyeleven' ); ?>">
+                                                        <input type="button" class="pickcolor button hide-if-no-js" value="<?php esc_attr_e( 'Select a Color', 'twentyeleven' ); ?>" />
                                                         <div id="colorPickerDiv" style="z-index: 100; background:#eee; border:1px solid #ccc; position:absolute; display:none;"></div>
                                                         <br />
@@ -231 +231 @@
                                                                         <input type="radio" name="twentyeleven_theme_options[theme_layout]" value="<?php echo esc_attr( $layout['value'] ); ?>" <?php checked( $options['theme_layout'], $layout['value'] ); ?> />
                                                                         <span>
-                                                                                <img src="<?php echo esc_url( $layout['thumbnail'] ); ?>"/>
+                                                                                <img src="<?php echo esc_url( $layout['thumbnail'] ); ?>" alt=""/>
                                                                                 <?php echo $layout['label']; ?>
                                                                         </span>