<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[17129] trunk/wp-admin: Validation fixes.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17129">17129</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-12-24 14:19:41 +0000 (Fri, 24 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Validation fixes. props ocean90, fixes <a href="http://trac.wordpress.org/ticket/15287">#15287</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditcommentsphp">trunk/wp-admin/edit-comments.php</a></li>
<li><a href="#trunkwpadminincludesclasswpmssiteslisttablephp">trunk/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpmsthemeslisttablephp">trunk/wp-admin/includes/class-wp-ms-themes-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswppluginslisttablephp">trunk/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminuploadphp">trunk/wp-admin/upload.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-comments.php (17128 => 17129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-comments.php 2010-12-23 19:45:19 UTC (rev 17128)
+++ trunk/wp-admin/edit-comments.php 2010-12-24 14:19:41 UTC (rev 17129)
</span><span class="lines">@@ -237,8 +237,8 @@
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><span class="cx"> <?php $wp_list_table->display(); ?>
</span><ins>+</form>
</ins><span class="cx"> </div>
</span><del>-</form>
</del><span class="cx">
</span><span class="cx"> <div id="ajax-response"></div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpmssiteslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-sites-list-table.php (17128 => 17129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-sites-list-table.php 2010-12-23 19:45:19 UTC (rev 17128)
+++ trunk/wp-admin/includes/class-wp-ms-sites-list-table.php 2010-12-24 14:19:41 UTC (rev 17129)
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'lastupdated':
</span><del>- echo "<td valign='top'class='$column_name column-$column_name'$style>";
</del><ins>+ echo "<td valign='top' class='$column_name column-$column_name'$style>";
</ins><span class="cx"> if ( 'list' == $mode )
</span><span class="cx"> $date = 'Y/m/d';
</span><span class="cx"> else
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> break;
</span><span class="cx"> case 'registered':
</span><del>- echo "<td valign='top'class='$column_name column-$column_name'$style>";
</del><ins>+ echo "<td valign='top' class='$column_name column-$column_name'$style>";
</ins><span class="cx"> if ( $blog['registered'] == '0000-00-00 00:00:00' )
</span><span class="cx"> echo '&#x2014;';
</span><span class="cx"> else
</span><span class="lines">@@ -287,7 +287,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> break;
</span><span class="cx"> case 'users':
</span><del>- echo "<td valign='top'class='$column_name column-$column_name'$style>";
</del><ins>+ echo "<td valign='top' class='$column_name column-$column_name'$style>";
</ins><span class="cx"> $blogusers = get_users( array( 'blog_id' => $blog['blog_id'], 'number' => 6) );
</span><span class="cx"> if ( is_array( $blogusers ) ) {
</span><span class="cx"> $blogusers_warning = '';
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpmsthemeslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-themes-list-table.php (17128 => 17129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-themes-list-table.php 2010-12-23 19:45:19 UTC (rev 17128)
+++ trunk/wp-admin/includes/class-wp-ms-themes-list-table.php 2010-12-24 14:19:41 UTC (rev 17129)
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx">
</span><span class="cx"> if ( 'search' != $type ) {
</span><span class="cx"> $status_links[$type] = sprintf( "<a href='%s' %s>%s</a>",
</span><del>- add_query_arg('theme_status', $type, $url),
</del><ins>+ esc_url( add_query_arg('theme_status', $type, $url) ),
</ins><span class="cx"> ( $type == $status ) ? ' class="current"' : '',
</span><span class="cx"> sprintf( $text, number_format_i18n( $count ) )
</span><span class="cx"> );
</span><span class="lines">@@ -293,7 +293,7 @@
</span><span class="cx"> $actions = apply_filters( "theme_action_links_$theme_key", $actions, $theme_key, $theme, $context );
</span><span class="cx">
</span><span class="cx"> $class = empty( $theme['enabled'] ) ? 'inactive' : 'active';
</span><del>- $checkbox_id = md5($theme['Name']) . "_checkbox";
</del><ins>+ $checkbox_id = "checkbox_" . md5($theme['Name']);
</ins><span class="cx"> $checkbox = "<input type='checkbox' name='checked[]' value='" . esc_attr( $theme_key ) . "' id='" . $checkbox_id . "' /><label class='screen-reader-text' for='" . $checkbox_id . "' >" . __('Select') . " " . $theme['Name'] . "</label>";
</span><span class="cx">
</span><span class="cx"> $description = '<p>' . $theme['Description'] . '</p>';
</span><span class="lines">@@ -325,14 +325,13 @@
</span><span class="cx"> <div class='$class second theme-version-author-uri'>";
</span><span class="cx">
</span><span class="cx"> $theme_meta = array();
</span><ins>+
</ins><span class="cx"> if ( !empty( $theme['Version'] ) )
</span><span class="cx"> $theme_meta[] = sprintf( __( 'Version %s' ), $theme['Version'] );
</span><del>- if ( !empty( $theme['Author'] ) ) {
- $author = $theme['Author'];
- if ( !empty( $theme['Author URI'] ) )
- $author = '<a href="' . $theme['Author URI'] . '" title="' . esc_attr__( 'Visit author homepage' ) . '">' . $theme['Author'] . '</a>';
- $theme_meta[] = sprintf( __( 'By %s' ), $author );
- }
</del><ins>+
+ if ( !empty( $theme['Author'] ) )
+ $theme_meta[] = sprintf( __( 'By %s' ), $theme['Author'] );
+
</ins><span class="cx"> if ( !empty( $theme['Theme URI'] ) )
</span><span class="cx"> $theme_meta[] = '<a href="' . $theme['Theme URI'] . '" title="' . esc_attr__( 'Visit theme homepage' ) . '">' . __( 'Visit Theme Site' ) . '</a>';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswppluginslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-plugins-list-table.php (17128 => 17129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-plugins-list-table.php 2010-12-23 19:45:19 UTC (rev 17128)
+++ trunk/wp-admin/includes/class-wp-plugins-list-table.php 2010-12-24 14:19:41 UTC (rev 17129)
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx"> $actions = apply_filters( $prefix . "plugin_action_links_$plugin_file", $actions, $plugin_file, $plugin_data, $context );
</span><span class="cx">
</span><span class="cx"> $class = $is_active ? 'active' : 'inactive';
</span><del>- $checkbox_id = md5($plugin_data['Name']) . "_checkbox";
</del><ins>+ $checkbox_id = "checkbox_" . md5($plugin_data['Name']);
</ins><span class="cx"> $checkbox = in_array( $status, array( 'mustuse', 'dropins' ) ) ? '' : "<input type='checkbox' name='checked[]' value='" . esc_attr( $plugin_file ) . "' id='" . $checkbox_id . "' /><label class='screen-reader-text' for='" . $checkbox_id . "' >" . __('Select') . " " . $plugin_data['Name'] . "</label>";
</span><span class="cx"> if ( 'dropins' != $context ) {
</span><span class="cx"> $description = '<p>' . ( $plugin_data['Description'] ? $plugin_data['Description'] : '&nbsp;' ) . '</p>';
</span></span></pre></div>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (17128 => 17129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2010-12-23 19:45:19 UTC (rev 17128)
+++ trunk/wp-admin/includes/dashboard.php 2010-12-24 14:19:41 UTC (rev 17129)
</span><span class="lines">@@ -442,14 +442,14 @@
</span><span class="cx"> <form name="searchform" action="<?php echo network_admin_url('users.php'); ?>" method="get">
</span><span class="cx"> <p>
</span><span class="cx"> <input type="text" name="s" value="" size="17" />
</span><del>- <?php submit_button( __( 'Search Users' ), 'button', 'submit', false ); ?>
</del><ins>+ <?php submit_button( __( 'Search Users' ), 'button', 'submit', false, array( 'id' => 'submit_users' ) ); ?>
</ins><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx">
</span><span class="cx"> <form name="searchform" action="<?php echo network_admin_url('sites.php'); ?>" method="get">
</span><span class="cx"> <p>
</span><span class="cx"> <input type="text" name="s" value="" size="17" />
</span><del>- <?php submit_button( __( 'Search Sites' ), 'button', 'submit', false ); ?>
</del><ins>+ <?php submit_button( __( 'Search Sites' ), 'button', 'submit', false, array( 'id' => 'submit_sites' ) ); ?>
</ins><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upload.php (17128 => 17129)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upload.php 2010-12-23 19:45:19 UTC (rev 17128)
+++ trunk/wp-admin/upload.php 2010-12-24 14:19:41 UTC (rev 17129)
</span><span class="lines">@@ -213,10 +213,8 @@
</span><span class="cx"> <div id="ajax-response"></div>
</span><span class="cx"> <?php find_posts_div(); ?>
</span><span class="cx"> <br class="clear" />
</span><del>-</div>
-</form>
-<br class="clear" />
</del><span class="cx">
</span><ins>+</form>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php
</span></span></pre>
</div>
</div>
</body>
</html>