<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[18010] trunk: Validation fixes.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/18010">18010</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-05-23 23:33:30 +0000 (Mon, 23 May 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Validation fixes. Props ocean90, peaceablewhale. see <a href="http://trac.wordpress.org/ticket/17364">#17364</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadmincustombackgroundphp">trunk/wp-admin/custom-background.php</a></li>
<li><a href="#trunkwpadmincustomheaderphp">trunk/wp-admin/custom-header.php</a></li>
<li><a href="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.php</a></li>
<li><a href="#trunkwpadminexportphp">trunk/wp-admin/export.php</a></li>
<li><a href="#trunkwpadminincludesclasswppostslisttablephp">trunk/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswptermslisttablephp">trunk/wp-admin/includes/class-wp-terms-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpuserslisttablephp">trunk/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminincludesnavmenuphp">trunk/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunkwpadminincludeswidgetsphp">trunk/wp-admin/includes/widgets.php</a></li>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
<li><a href="#trunkwpadminnetworksiteusersphp">trunk/wp-admin/network/site-users.php</a></li>
<li><a href="#trunkwpadminoptionswritingphp">trunk/wp-admin/options-writing.php</a></li>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/themes.php</a></li>
<li><a href="#trunkwpcontentthemestwentyelevenincthemeoptionsphp">trunk/wp-content/themes/twentyeleven/inc/theme-options.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (18009 => 18010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php        2011-05-23 23:11:03 UTC (rev 18009)
+++ trunk/wp-admin/admin-ajax.php        2011-05-23 23:33:30 UTC (rev 18010)
</span><span class="lines">@@ -508,7 +508,7 @@
</span><span class="cx">         $x-&gt;send();
</span><span class="cx">         break;
</span><span class="cx"> case 'add-tag' :
</span><del>-        check_ajax_referer( 'add-tag' );
</del><ins>+        check_ajax_referer( 'add-tag', '_wpnonce_add-tag' );
</ins><span class="cx">         $post_type = !empty($_POST['post_type']) ? $_POST['post_type'] : 'post';
</span><span class="cx">         $taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';
</span><span class="cx">         $tax = get_taxonomy($taxonomy);
</span></span></pre></div>
<a id="trunkwpadmincustombackgroundphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-background.php (18009 => 18010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-background.php        2011-05-23 23:11:03 UTC (rev 18009)
+++ trunk/wp-admin/custom-background.php        2011-05-23 23:33:30 UTC (rev 18010)
</span><span class="lines">@@ -237,7 +237,6 @@
</span><span class="cx"> &lt;input type=&quot;hidden&quot; name=&quot;action&quot; value=&quot;save&quot; /&gt;
</span><span class="cx"> &lt;?php wp_nonce_field('custom-background-upload', '_wpnonce-custom-background-upload') ?&gt;
</span><span class="cx"> &lt;?php submit_button( __( 'Upload' ), 'button', 'submit', false ); ?&gt;
</span><del>-&lt;/p&gt;
</del><span class="cx"> &lt;/form&gt;
</span><span class="cx"> &lt;/td&gt;
</span><span class="cx"> &lt;/tr&gt;
</span><span class="lines">@@ -270,10 +269,10 @@
</span><span class="cx"> &lt;tr valign=&quot;top&quot;&gt;
</span><span class="cx"> &lt;th scope=&quot;row&quot;&gt;&lt;?php _e( 'Repeat' ); ?&gt;&lt;/th&gt;
</span><span class="cx"> &lt;td&gt;&lt;fieldset&gt;&lt;legend class=&quot;screen-reader-text&quot;&gt;&lt;span&gt;&lt;?php _e( 'Background Repeat' ); ?&gt;&lt;/span&gt;&lt;/legend&gt;
</span><del>-&lt;label&gt;&lt;input type=&quot;radio&quot; name=&quot;background-repeat&quot; value=&quot;no-repeat&quot;&lt;?php checked('no-repeat', get_theme_mod('background_repeat', 'repeat')); ?&gt;&gt; &lt;?php _e('No Repeat'); ?&gt;&lt;/option&gt;&lt;/label&gt;
-        &lt;label&gt;&lt;input type=&quot;radio&quot; name=&quot;background-repeat&quot; value=&quot;repeat&quot;&lt;?php checked('repeat', get_theme_mod('background_repeat', 'repeat')); ?&gt;&gt; &lt;?php _e('Tile'); ?&gt;&lt;/option&gt;&lt;/label&gt;
-        &lt;label&gt;&lt;input type=&quot;radio&quot; name=&quot;background-repeat&quot; value=&quot;repeat-x&quot;&lt;?php checked('repeat-x', get_theme_mod('background_repeat', 'repeat')); ?&gt;&gt; &lt;?php _e('Tile Horizontally'); ?&gt;&lt;/option&gt;&lt;/label&gt;
-        &lt;label&gt;&lt;input type=&quot;radio&quot; name=&quot;background-repeat&quot; value=&quot;repeat-y&quot;&lt;?php checked('repeat-y', get_theme_mod('background_repeat', 'repeat')); ?&gt;&gt; &lt;?php _e('Tile Vertically'); ?&gt;&lt;/option&gt;&lt;/label&gt;
</del><ins>+&lt;label&gt;&lt;input type=&quot;radio&quot; name=&quot;background-repeat&quot; value=&quot;no-repeat&quot;&lt;?php checked('no-repeat', get_theme_mod('background_repeat', 'repeat')); ?&gt; /&gt; &lt;?php _e('No Repeat'); ?&gt;&lt;/label&gt;
+        &lt;label&gt;&lt;input type=&quot;radio&quot; name=&quot;background-repeat&quot; value=&quot;repeat&quot;&lt;?php checked('repeat', get_theme_mod('background_repeat', 'repeat')); ?&gt; /&gt; &lt;?php _e('Tile'); ?&gt;&lt;/label&gt;
+        &lt;label&gt;&lt;input type=&quot;radio&quot; name=&quot;background-repeat&quot; value=&quot;repeat-x&quot;&lt;?php checked('repeat-x', get_theme_mod('background_repeat', 'repeat')); ?&gt; /&gt; &lt;?php _e('Tile Horizontally'); ?&gt;&lt;/label&gt;
+        &lt;label&gt;&lt;input type=&quot;radio&quot; name=&quot;background-repeat&quot; value=&quot;repeat-y&quot;&lt;?php checked('repeat-y', get_theme_mod('background_repeat', 'repeat')); ?&gt; /&gt; &lt;?php _e('Tile Vertically'); ?&gt;&lt;/label&gt;
</ins><span class="cx"> &lt;/fieldset&gt;&lt;/td&gt;
</span><span class="cx"> &lt;/tr&gt;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadmincustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-header.php (18009 => 18010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-header.php        2011-05-23 23:11:03 UTC (rev 18009)
+++ trunk/wp-admin/custom-header.php        2011-05-23 23:33:30 UTC (rev 18010)
</span><span class="lines">@@ -388,7 +388,8 @@
</span><span class="cx">                 &lt;?php if ( 'blank' == get_theme_mod( 'header_textcolor', HEADER_TEXTCOLOR ) || '' == get_theme_mod('header_textcolor', HEADER_TEXTCOLOR) || ! $this-&gt;header_text() ) { ?&gt;
</span><span class="cx">                 toggle_text();
</span><span class="cx">                 &lt;?php } ?&gt;
</span><del>-                });
</del><ins>+        });
+/* ]]&gt; */
</ins><span class="cx"> &lt;/script&gt;
</span><span class="cx"> &lt;?php
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tags.php (18009 => 18010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php        2011-05-23 23:11:03 UTC (rev 18009)
+++ trunk/wp-admin/edit-tags.php        2011-05-23 23:33:30 UTC (rev 18010)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> 
</span><span class="cx"> case 'add-tag':
</span><span class="cx"> 
</span><del>-        check_admin_referer( 'add-tag' );
</del><ins>+        check_admin_referer( 'add-tag', '_wpnonce_add-tag' );
</ins><span class="cx"> 
</span><span class="cx">         if ( !current_user_can( $tax-&gt;cap-&gt;edit_terms ) )
</span><span class="cx">                 wp_die( __( 'Cheatin&amp;#8217; uh?' ) );
</span><span class="lines">@@ -328,7 +328,7 @@
</span><span class="cx"> &lt;input type=&quot;hidden&quot; name=&quot;screen&quot; value=&quot;&lt;?php echo esc_attr($current_screen-&gt;id); ?&gt;&quot; /&gt;
</span><span class="cx"> &lt;input type=&quot;hidden&quot; name=&quot;taxonomy&quot; value=&quot;&lt;?php echo esc_attr($taxonomy); ?&gt;&quot; /&gt;
</span><span class="cx"> &lt;input type=&quot;hidden&quot; name=&quot;post_type&quot; value=&quot;&lt;?php echo esc_attr($post_type); ?&gt;&quot; /&gt;
</span><del>-&lt;?php wp_nonce_field('add-tag'); ?&gt;
</del><ins>+&lt;?php wp_nonce_field('add-tag', '_wpnonce_add-tag'); ?&gt;
</ins><span class="cx"> 
</span><span class="cx"> &lt;div class=&quot;form-field form-required&quot;&gt;
</span><span class="cx">         &lt;label for=&quot;tag-name&quot;&gt;&lt;?php _ex('Name', 'Taxonomy Name'); ?&gt;&lt;/label&gt;
</span></span></pre></div>
<a id="trunkwpadminexportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/export.php (18009 => 18010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/export.php        2011-05-23 23:11:03 UTC (rev 18009)
+++ trunk/wp-admin/export.php        2011-05-23 23:33:30 UTC (rev 18010)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">                         continue;
</span><span class="cx"> 
</span><span class="cx">                 $month = zeroise( $date-&gt;month, 2 );
</span><del>-                echo '&lt;option value=&quot;' . $date-&gt;year . '-' . $month . '&quot; /&gt;' . $wp_locale-&gt;get_month( $month ) . ' ' . $date-&gt;year . '&lt;/option&gt;';
</del><ins>+                echo '&lt;option value=&quot;' . $date-&gt;year . '-' . $month . '&quot;&gt;' . $wp_locale-&gt;get_month( $month ) . ' ' . $date-&gt;year . '&lt;/option&gt;';
</ins><span class="cx">         }
</span><span class="cx"> }
</span><span class="cx"> ?&gt;
</span></span></pre></div>
<a id="trunkwpadminincludesclasswppostslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-posts-list-table.php (18009 => 18010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-posts-list-table.php        2011-05-23 23:11:03 UTC (rev 18009)
+++ trunk/wp-admin/includes/class-wp-posts-list-table.php        2011-05-23 23:33:30 UTC (rev 18010)
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx"> 
</span><span class="cx">                 $post_status = !empty( $_REQUEST['post_status'] ) ? $_REQUEST['post_status'] : 'all';
</span><span class="cx">                 if ( post_type_supports( $post_type, 'comments' ) &amp;&amp; !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) )
</span><del>-                        $posts_columns['comments'] = '&lt;div class=&quot;vers&quot;&gt;&lt;img alt=&quot;' . esc_attr__( 'Comments' ) . '&quot; src=&quot;' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '&quot; /&gt;&lt;/div&gt;';
</del><ins>+                        $posts_columns['comments'] = '&lt;span class=&quot;vers&quot;&gt;&lt;img alt=&quot;' . esc_attr__( 'Comments' ) . '&quot; src=&quot;' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '&quot; /&gt;&lt;/span&gt;';
</ins><span class="cx"> 
</span><span class="cx">                 $posts_columns['date'] = __( 'Date' );
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadminincludesclasswptermslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-terms-list-table.php (18009 => 18010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-terms-list-table.php        2011-05-23 23:11:03 UTC (rev 18009)
+++ trunk/wp-admin/includes/class-wp-terms-list-table.php        2011-05-23 23:33:30 UTC (rev 18010)
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx">                 $pad = str_repeat( '&amp;#8212; ', max( 0, $this-&gt;level ) );
</span><span class="cx">                 $name = apply_filters( 'term_name', $pad . ' ' . $tag-&gt;name, $tag );
</span><span class="cx">                 $qe_data = get_term( $tag-&gt;term_id, $taxonomy, OBJECT, 'edit' );
</span><del>-                $edit_link = get_edit_term_link( $tag-&gt;term_id, $taxonomy, $post_type );
</del><ins>+                $edit_link = esc_url( get_edit_term_link( $tag-&gt;term_id, $taxonomy, $post_type ) );
</ins><span class="cx"> 
</span><span class="cx">                 $out = '&lt;strong&gt;&lt;a class=&quot;row-title&quot; href=&quot;' . $edit_link . '&quot; title=&quot;' . esc_attr( sprintf( __( 'Edit &amp;#8220;%s&amp;#8221;' ), $name ) ) . '&quot;&gt;' . $name . '&lt;/a&gt;&lt;/strong&gt;&lt;br /&gt;';
</span><span class="cx"> 
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx">                 $out .= '&lt;div class=&quot;hidden&quot; id=&quot;inline_' . $qe_data-&gt;term_id . '&quot;&gt;';
</span><span class="cx">                 $out .= '&lt;div class=&quot;name&quot;&gt;' . $qe_data-&gt;name . '&lt;/div&gt;';
</span><span class="cx">                 $out .= '&lt;div class=&quot;slug&quot;&gt;' . apply_filters( 'editable_slug', $qe_data-&gt;slug ) . '&lt;/div&gt;';
</span><del>-                $out .= '&lt;div class=&quot;parent&quot;&gt;' . $qe_data-&gt;parent . '&lt;/div&gt;&lt;/div&gt;&lt;/td&gt;';
</del><ins>+                $out .= '&lt;div class=&quot;parent&quot;&gt;' . $qe_data-&gt;parent . '&lt;/div&gt;&lt;/div&gt;';
</ins><span class="cx"> 
</span><span class="cx">                 return $out;
</span><span class="cx">         }
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> 
</span><span class="cx">                 $args['post_type'] = $post_type;
</span><span class="cx"> 
</span><del>-                return &quot;&lt;a href='&quot; . add_query_arg( $args, 'edit.php' ) . &quot;'&gt;$count&lt;/a&gt;&quot;;
</del><ins>+                return &quot;&lt;a href='&quot; . esc_url ( add_query_arg( $args, 'edit.php' ) ) . &quot;'&gt;$count&lt;/a&gt;&quot;;
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         function column_links( $tag ) {
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpuserslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-users-list-table.php (18009 => 18010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-users-list-table.php        2011-05-23 23:11:03 UTC (rev 18009)
+++ trunk/wp-admin/includes/class-wp-users-list-table.php        2011-05-23 23:33:30 UTC (rev 18010)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx">                         $name = translate_user_role( $name );
</span><span class="cx">                         /* translators: User role name with count */
</span><span class="cx">                         $name = sprintf( __('%1$s &lt;span class=&quot;count&quot;&gt;(%2$s)&lt;/span&gt;'), $name, $avail_roles[$this_role] );
</span><del>-                        $role_links[$this_role] = &quot;&lt;a href='&quot; . add_query_arg( 'role', $this_role, $url ) . &quot;'$class&gt;$name&lt;/a&gt;&quot;;
</del><ins>+                        $role_links[$this_role] = &quot;&lt;a href='&quot; . esc_html( add_query_arg( 'role', $this_role, $url ) ) . &quot;'$class&gt;$name&lt;/a&gt;&quot;;
</ins><span class="cx">                 }
</span><span class="cx"> 
</span><span class="cx">                 return $role_links;
</span></span></pre></div>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (18009 => 18010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php        2011-05-23 23:11:03 UTC (rev 18009)
+++ trunk/wp-admin/includes/dashboard.php        2011-05-23 23:33:30 UTC (rev 18010)
</span><span class="lines">@@ -552,7 +552,7 @@
</span><span class="cx">                         &lt;input type=&quot;reset&quot; value=&quot;&lt;?php esc_attr_e( 'Reset' ); ?&gt;&quot; class=&quot;button&quot; /&gt;
</span><span class="cx">                         &lt;span id=&quot;publishing-action&quot;&gt;
</span><span class="cx">                                 &lt;input type=&quot;submit&quot; name=&quot;publish&quot; id=&quot;publish&quot; accesskey=&quot;p&quot; tabindex=&quot;5&quot; class=&quot;button-primary&quot; value=&quot;&lt;?php current_user_can('publish_posts') ? esc_attr_e('Publish') : esc_attr_e('Submit for Review'); ?&gt;&quot; /&gt;
</span><del>-                                &lt;img class=&quot;waiting&quot; src=&quot;&lt;?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?&gt;&quot; /&gt;
</del><ins>+                                &lt;img class=&quot;waiting&quot; src=&quot;&lt;?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?&gt;&quot; alt=&quot;&quot; /&gt;
</ins><span class="cx">                         &lt;/span&gt;
</span><span class="cx">                         &lt;br class=&quot;clear&quot; /&gt;
</span><span class="cx">                 &lt;/p&gt;
</span></span></pre></div>
<a id="trunkwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/nav-menu.php (18009 => 18010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/nav-menu.php        2011-05-23 23:11:03 UTC (rev 18009)
+++ trunk/wp-admin/includes/nav-menu.php        2011-05-23 23:33:30 UTC (rev 18010)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx">                                                         remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
</span><span class="cx">                                                 ),
</span><span class="cx">                                                 'delete-menu_item_' . $item_id
</span><del>-                                        ); ?&gt;&quot;&gt;&lt;?php _e('Remove'); ?&gt;&lt;/a&gt; &lt;span class=&quot;meta-sep&quot;&gt; | &lt;/span&gt; &lt;a class=&quot;item-cancel submitcancel&quot; id=&quot;cancel-&lt;?php echo $item_id; ?&gt;&quot; href=&quot;&lt;?php        echo add_query_arg( array('edit-menu-item' =&gt; $item_id, 'cancel' =&gt; time()), remove_query_arg( $removed_args, admin_url( 'nav-menus.php' ) ) );
</del><ins>+                                        ); ?&gt;&quot;&gt;&lt;?php _e('Remove'); ?&gt;&lt;/a&gt; &lt;span class=&quot;meta-sep&quot;&gt; | &lt;/span&gt; &lt;a class=&quot;item-cancel submitcancel&quot; id=&quot;cancel-&lt;?php echo $item_id; ?&gt;&quot; href=&quot;&lt;?php        echo esc_url( add_query_arg( array('edit-menu-item' =&gt; $item_id, 'cancel' =&gt; time()), remove_query_arg( $removed_args, admin_url( 'nav-menus.php' ) ) ) );
</ins><span class="cx">                                                 ?&gt;#menu-item-settings-&lt;?php echo $item_id; ?&gt;&quot;&gt;&lt;?php _e('Cancel'); ?&gt;&lt;/a&gt;
</span><span class="cx">                                 &lt;/div&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -690,7 +690,7 @@
</span><span class="cx">                         &lt;p class=&quot;quick-search-wrap&quot;&gt;
</span><span class="cx">                                 &lt;input type=&quot;text&quot; class=&quot;quick-search input-with-default-title&quot; title=&quot;&lt;?php esc_attr_e('Search'); ?&gt;&quot; value=&quot;&lt;?php echo $searched; ?&gt;&quot; name=&quot;quick-search-posttype-&lt;?php echo $post_type_name; ?&gt;&quot; /&gt;
</span><span class="cx">                                 &lt;img class=&quot;waiting&quot; src=&quot;&lt;?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?&gt;&quot; alt=&quot;&quot; /&gt;
</span><del>-                                &lt;?php submit_button( __( 'Search' ), 'quick-search-submit button-secondary hide-if-js', 'submit', false ); ?&gt;
</del><ins>+                                &lt;?php submit_button( __( 'Search' ), 'quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' =&gt; 'submit-quick-search-posttype-' . $post_type_name ) ); ?&gt;
</ins><span class="cx">                         &lt;/p&gt;
</span><span class="cx"> 
</span><span class="cx">                         &lt;ul id=&quot;&lt;?php echo $post_type_name; ?&gt;-search-checklist&quot; class=&quot;list:&lt;?php echo $post_type_name?&gt; categorychecklist form-no-clear&quot;&gt;
</span><span class="lines">@@ -924,7 +924,7 @@
</span><span class="cx">                         &lt;p class=&quot;quick-search-wrap&quot;&gt;
</span><span class="cx">                                 &lt;input type=&quot;text&quot; class=&quot;quick-search input-with-default-title&quot; title=&quot;&lt;?php esc_attr_e('Search'); ?&gt;&quot; value=&quot;&lt;?php echo $searched; ?&gt;&quot; name=&quot;quick-search-taxonomy-&lt;?php echo $taxonomy_name; ?&gt;&quot; /&gt;
</span><span class="cx">                                 &lt;img class=&quot;waiting&quot; src=&quot;&lt;?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?&gt;&quot; alt=&quot;&quot; /&gt;
</span><del>-                                &lt;?php submit_button( __( 'Search' ), 'quick-search-submit button-secondary hide-if-js', 'submit', false ); ?&gt;
</del><ins>+                                &lt;?php submit_button( __( 'Search' ), 'quick-search-submit button-secondary hide-if-js', 'submit', false, array( 'id' =&gt; 'submit-quick-search-taxonomy-' . $taxonomy_name ) ); ?&gt;
</ins><span class="cx">                         &lt;/p&gt;
</span><span class="cx"> 
</span><span class="cx">                         &lt;ul id=&quot;&lt;?php echo $taxonomy_name; ?&gt;-search-checklist&quot; class=&quot;list:&lt;?php echo $taxonomy_name?&gt; categorychecklist form-no-clear&quot;&gt;
</span></span></pre></div>
<a id="trunkwpadminincludeswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/widgets.php (18009 => 18010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/widgets.php        2011-05-23 23:11:03 UTC (rev 18009)
+++ trunk/wp-admin/includes/widgets.php        2011-05-23 23:33:30 UTC (rev 18010)
</span><span class="lines">@@ -207,8 +207,8 @@
</span><span class="cx">                 &lt;a class=&quot;widget-control-close&quot; href=&quot;#close&quot;&gt;&lt;?php _e('Close'); ?&gt;&lt;/a&gt;
</span><span class="cx">                 &lt;/div&gt;
</span><span class="cx">                 &lt;div class=&quot;alignright&lt;?php if ( 'noform' === $has_form ) echo ' widget-control-noform'; ?&gt;&quot;&gt;
</span><del>-                &lt;img src=&quot;&lt;?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?&gt;&quot; class=&quot;ajax-feedback &quot; title=&quot;&quot; alt=&quot;&quot; /&gt;
-                &lt;?php submit_button( __( 'Save' ), 'button-primary widget-control-save', 'savewidget', false ); ?&gt;
</del><ins>+                &lt;img src=&quot;&lt;?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?&gt;&quot; class=&quot;ajax-feedback&quot; title=&quot;&quot; alt=&quot;&quot; /&gt;
+                &lt;?php submit_button( __( 'Save' ), 'button-primary widget-control-save', 'savewidget', false, array( 'id' =&gt; 'widget-' . esc_attr( $id_format ) . '-savewidget' ) ); ?&gt;
</ins><span class="cx">                 &lt;/div&gt;
</span><span class="cx">                 &lt;br class=&quot;clear&quot; /&gt;
</span><span class="cx">         &lt;/div&gt;
</span></span></pre></div>
<a id="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (18009 => 18010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php        2011-05-23 23:11:03 UTC (rev 18009)
+++ trunk/wp-admin/nav-menus.php        2011-05-23 23:33:30 UTC (rev 18010)
</span><span class="lines">@@ -556,7 +556,7 @@
</span><span class="cx">                                                                 &lt;?php endif; ?&gt;
</span><span class="cx">                                                                 &lt;br class=&quot;clear&quot; /&gt;
</span><span class="cx">                                                                 &lt;div class=&quot;publishing-action&quot;&gt;
</span><del>-                                                                        &lt;?php submit_button( empty( $nav_menu_selected_id ) ? __( 'Create Menu' ) : __( 'Save Menu' ), 'button-primary menu-save', 'save_menu', false ); ?&gt;
</del><ins>+                                                                        &lt;?php submit_button( empty( $nav_menu_selected_id ) ? __( 'Create Menu' ) : __( 'Save Menu' ), 'button-primary menu-save', 'save_menu', false, array( 'id' =&gt; 'save_menu_header' ) ); ?&gt;
</ins><span class="cx">                                                                 &lt;/div&gt;&lt;!-- END .publishing-action --&gt;
</span><span class="cx"> 
</span><span class="cx">                                                                 &lt;?php if ( ! empty( $nav_menu_selected_id ) ) : ?&gt;
</span><span class="lines">@@ -595,7 +595,7 @@
</span><span class="cx">                                                 &lt;div class=&quot;publishing-action&quot;&gt;
</span><span class="cx">                                                         &lt;?php
</span><span class="cx">                                                         if ( ! empty( $nav_menu_selected_id ) )
</span><del>-                                                                submit_button( __( 'Save Menu' ), 'button-primary menu-save', 'save_menu', false );
</del><ins>+                                                                submit_button( __( 'Save Menu' ), 'button-primary menu-save', 'save_menu', false, array( 'id' =&gt; 'save_menu_footer' ) );
</ins><span class="cx">                                                         ?&gt;
</span><span class="cx">                                                 &lt;/div&gt;
</span><span class="cx">                                                 &lt;/div&gt;
</span></span></pre></div>
<a id="trunkwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-users.php (18009 => 18010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-users.php        2011-05-23 23:11:03 UTC (rev 18009)
+++ trunk/wp-admin/network/site-users.php        2011-05-23 23:33:30 UTC (rev 18010)
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx">                 &lt;/tr&gt;
</span><span class="cx">         &lt;/table&gt;
</span><span class="cx">         &lt;?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?&gt;
</span><del>-        &lt;?php submit_button( __('Add User'), 'primary', 'add-user' ); ?&gt;
</del><ins>+        &lt;?php submit_button( __('Add User'), 'primary', 'add-user', false, array( 'id' =&gt; 'submit-add-existing-user' ) ); ?&gt;
</ins><span class="cx"> &lt;/form&gt;
</span><span class="cx"> &lt;?php endif; ?&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx">                 &lt;/tr&gt;
</span><span class="cx">         &lt;/table&gt;
</span><span class="cx">         &lt;?php wp_nonce_field( 'add-user', '_wpnonce_add-new-user' ) ?&gt;
</span><del>-        &lt;?php submit_button( __('Add New User'), 'primary', 'add-user' ); ?&gt;
</del><ins>+        &lt;?php submit_button( __('Add New User'), 'primary', 'add-user', false, array( 'id' =&gt; 'submit-add-user' ) ); ?&gt;
</ins><span class="cx"> &lt;/form&gt;
</span><span class="cx"> &lt;?php endif; ?&gt;
</span><span class="cx"> &lt;/div&gt;
</span></span></pre></div>
<a id="trunkwpadminoptionswritingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-writing.php (18009 => 18010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-writing.php        2011-05-23 23:11:03 UTC (rev 18009)
+++ trunk/wp-admin/options-writing.php        2011-05-23 23:33:30 UTC (rev 18010)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> &lt;?php foreach ( $post_formats[0] as $format ): ?&gt;
</span><span class="cx">                 &lt;option&lt;?php selected( get_option('default_post_format'), $format ); ?&gt; value=&quot;&lt;?php echo esc_attr( $format ); ?&gt;&quot;&gt;&lt;?php echo esc_html( get_post_format_string( $format ) ); ?&gt;&lt;/option&gt;
</span><span class="cx"> &lt;?php endforeach; ?&gt;
</span><del>-        &lt;/select&gt;&lt;/label&gt;
</del><ins>+        &lt;/select&gt;
</ins><span class="cx"> &lt;/td&gt;
</span><span class="cx"> &lt;/tr&gt;
</span><span class="cx"> &lt;?php endif; endif; ?&gt;
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (18009 => 18010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php        2011-05-23 23:11:03 UTC (rev 18009)
+++ trunk/wp-admin/themes.php        2011-05-23 23:33:30 UTC (rev 18010)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> &lt;p class=&quot;search-box&quot;&gt;
</span><span class="cx">         &lt;label class=&quot;screen-reader-text&quot; for=&quot;theme-search-input&quot;&gt;&lt;?php _e('Search Installed Themes'); ?&gt;:&lt;/label&gt;
</span><span class="cx">         &lt;input type=&quot;text&quot; id=&quot;theme-search-input&quot; name=&quot;s&quot; value=&quot;&lt;?php _admin_search_query(); ?&gt;&quot; /&gt;
</span><del>-        &lt;?php submit_button( __( 'Search Installed Themes' ), 'button', 'submit', false ); ?&gt;
</del><ins>+        &lt;?php submit_button( __( 'Search Installed Themes' ), 'button', false, false, array( 'id' =&gt; 'search-submit' ) ); ?&gt;
</ins><span class="cx">         &lt;a id=&quot;filter-click&quot; href=&quot;?filter=1&quot;&gt;&lt;?php _e( 'Feature Filter' ); ?&gt;&lt;/a&gt;
</span><span class="cx"> &lt;/p&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx">         &lt;?php endforeach; ?&gt;
</span><span class="cx"> 
</span><span class="cx">         &lt;div class=&quot;feature-container&quot;&gt;
</span><del>-                &lt;?php submit_button( __( 'Apply Filters' ), 'button-secondary submitter', 'submit', false, array( 'style' =&gt; 'margin-left: 120px' ) ); ?&gt;
</del><ins>+                &lt;?php submit_button( __( 'Apply Filters' ), 'button-secondary submitter', false, false, array( 'style' =&gt; 'margin-left: 120px', 'id' =&gt; 'filter-submit' ) ); ?&gt;
</ins><span class="cx">                 &amp;nbsp;
</span><span class="cx">                 &lt;small&gt;&lt;a id=&quot;mini-filter-click&quot; href=&quot;&lt;?php echo esc_url( remove_query_arg( array('filter', 'features', 'submit') ) ); ?&gt;&quot;&gt;&lt;?php _e( 'Close filters' )?&gt;&lt;/a&gt;&lt;/small&gt;
</span><span class="cx">         &lt;/div&gt;
</span></span></pre></div>
<a id="trunkwpcontentthemestwentyelevenincthemeoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyeleven/inc/theme-options.php (18009 => 18010)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyeleven/inc/theme-options.php        2011-05-23 23:11:03 UTC (rev 18009)
+++ trunk/wp-content/themes/twentyeleven/inc/theme-options.php        2011-05-23 23:33:30 UTC (rev 18010)
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx">                                                                 &lt;label class=&quot;description&quot;&gt;
</span><span class="cx">                                                                         &lt;input type=&quot;radio&quot; name=&quot;twentyeleven_theme_options[color_scheme]&quot; value=&quot;&lt;?php echo esc_attr( $color['value'] ); ?&gt;&quot; &lt;?php checked( $options['color_scheme'], $color['value'] ); ?&gt; /&gt;
</span><span class="cx">                                                                         &lt;span&gt;
</span><del>-                                                                                &lt;img src=&quot;&lt;?php echo esc_url( $color['thumbnail'] ); ?&gt;&quot;/&gt;
</del><ins>+                                                                                &lt;img src=&quot;&lt;?php echo esc_url( $color['thumbnail'] ); ?&gt;&quot; alt=&quot;&quot;/&gt;
</ins><span class="cx">                                                                                 &lt;?php echo $color['label']; ?&gt;
</span><span class="cx">                                                                         &lt;/span&gt;
</span><span class="cx">                                                                 &lt;/label&gt;
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx">                                                 &lt;fieldset&gt;&lt;legend class=&quot;screen-reader-text&quot;&gt;&lt;span&gt;&lt;?php _e( 'Link Color', 'twentyeleven' ); ?&gt;&lt;/span&gt;&lt;/legend&gt;
</span><span class="cx">                                                         &lt;input type=&quot;text&quot; name=&quot;twentyeleven_theme_options[link_color]&quot; id=&quot;link-color&quot; value=&quot;&lt;?php echo esc_attr( $options['link_color'] ); ?&gt;&quot; /&gt;
</span><span class="cx">                                                         &lt;a href=&quot;#&quot; class=&quot;pickcolor hide-if-no-js&quot; id=&quot;link-color-example&quot;&gt;&lt;/a&gt;
</span><del>-                                                        &lt;input type=&quot;button&quot; class=&quot;pickcolor button hide-if-no-js&quot; value=&quot;&lt;?php esc_attr_e( 'Select a Color', 'twentyeleven' ); ?&gt;&quot;&gt;
</del><ins>+                                                        &lt;input type=&quot;button&quot; class=&quot;pickcolor button hide-if-no-js&quot; value=&quot;&lt;?php esc_attr_e( 'Select a Color', 'twentyeleven' ); ?&gt;&quot; /&gt;
</ins><span class="cx">                                                         &lt;div id=&quot;colorPickerDiv&quot; style=&quot;z-index: 100; background:#eee; border:1px solid #ccc; position:absolute; display:none;&quot;&gt;&lt;/div&gt;
</span><span class="cx">                                                         &lt;br /&gt;
</span><span class="cx">                                                         &lt;small class=&quot;description&quot;&gt;&lt;?php printf( __( 'Default color: %s', 'twentyeleven' ), $default_options['link_color'] ); ?&gt;&lt;/small&gt;
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx">                                                                 &lt;label class=&quot;description&quot;&gt;
</span><span class="cx">                                                                         &lt;input type=&quot;radio&quot; name=&quot;twentyeleven_theme_options[theme_layout]&quot; value=&quot;&lt;?php echo esc_attr( $layout['value'] ); ?&gt;&quot; &lt;?php checked( $options['theme_layout'], $layout['value'] ); ?&gt; /&gt;
</span><span class="cx">                                                                         &lt;span&gt;
</span><del>-                                                                                &lt;img src=&quot;&lt;?php echo esc_url( $layout['thumbnail'] ); ?&gt;&quot;/&gt;
</del><ins>+                                                                                &lt;img src=&quot;&lt;?php echo esc_url( $layout['thumbnail'] ); ?&gt;&quot; alt=&quot;&quot;/&gt;
</ins><span class="cx">                                                                                 &lt;?php echo $layout['label']; ?&gt;
</span><span class="cx">                                                                         &lt;/span&gt;
</span><span class="cx">                                                                 &lt;/label&gt;
</span></span></pre>
</div>
</div>

</body>
</html>