<!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>[16066] trunk: Revert submit_button() for wp-includes, setup-config,
install, login, signup.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16066">16066</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-10-29 00:31:27 +0000 (Fri, 29 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert submit_button() for wp-includes, setup-config, install, login, signup. see <a href="http://trac.wordpress.org/changeset/16061">[16061]</a>, see <a href="http://trac.wordpress.org/ticket/15064">#15064</a>, fixes <a href="http://trac.wordpress.org/ticket/15247">#15247</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmininstallphp">trunk/wp-admin/install.php</a></li>
<li><a href="#trunkwpadminsetupconfigphp">trunk/wp-admin/setup-config.php</a></li>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludesthemecompatcommentspopupphp">trunk/wp-includes/theme-compat/comments-popup.php</a></li>
<li><a href="#trunkwpincludesthemecompatcommentsphp">trunk/wp-includes/theme-compat/comments.php</a></li>
<li><a href="#trunkwploginphp">trunk/wp-login.php</a></li>
<li><a href="#trunkwpsignupphp">trunk/wp-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/install.php (16065 => 16066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/install.php 2010-10-28 22:15:54 UTC (rev 16065)
+++ trunk/wp-admin/install.php 2010-10-29 00:31:27 UTC (rev 16066)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> <td colspan="2"><label><input type="checkbox" name="blog_public" value="1" <?php checked( $blog_public ); ?> /> <?php _e( 'Allow my site to appear in search engines like Google and Technorati.' ); ?></label></td>
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><del>- <p class="step"><?php submit_button( __( 'Install WordPress' ), 'button', 'Submit', false ); ?></p>
</del><ins>+ <p class="step"><input type="submit" name="Submit" value="<?php esc_attr_e( 'Install WordPress' ); ?>" class="button" /></p>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> } // end display_setup_form()
</span></span></pre></div>
<a id="trunkwpadminsetupconfigphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/setup-config.php (16065 => 16066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/setup-config.php 2010-10-28 22:15:54 UTC (rev 16065)
+++ trunk/wp-admin/setup-config.php 2010-10-29 00:31:27 UTC (rev 16066)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="cx"> <?php if ( isset( $_GET['noapi'] ) ) { ?><input name="noapi" type="hidden" value="true" /><?php } ?>
</span><del>- <p class="step"><?php submit_button( __( 'Submit' ), 'button', 'submit', false ); ?></p>
</del><ins>+ <p class="step"><input name="submit" type="submit" value="Submit" class="button" /></p>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (16065 => 16066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2010-10-28 22:15:54 UTC (rev 16065)
+++ trunk/wp-includes/comment-template.php 2010-10-29 00:31:27 UTC (rev 16066)
</span><span class="lines">@@ -1572,7 +1572,7 @@
</span><span class="cx"> <?php echo apply_filters( 'comment_form_field_comment', $args['comment_field'] ); ?>
</span><span class="cx"> <?php echo $args['comment_notes_after']; ?>
</span><span class="cx"> <p class="form-submit">
</span><del>- <?php submit_button( $args['label_submit'], 'button', 'submit', false, array( 'id' => $args['id_submit'] ) ); ?>
</del><ins>+ <input name="submit" type="submit" id="<?php echo esc_attr( $args['id_submit'] ); ?>" value="<?php echo esc_attr( $args['label_submit'] ); ?>" />
</ins><span class="cx"> <?php comment_id_fields(); ?>
</span><span class="cx"> </p>
</span><span class="cx"> <?php do_action( 'comment_form', $post_id ); ?>
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (16065 => 16066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-10-28 22:15:54 UTC (rev 16065)
+++ trunk/wp-includes/general-template.php 2010-10-29 00:31:27 UTC (rev 16066)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> $form = '<form role="search" method="get" id="searchform" action="' . home_url( '/' ) . '" >
</span><span class="cx"> <div><label class="screen-reader-text" for="s">' . __('Search for:') . '</label>
</span><span class="cx"> <input type="text" value="' . get_search_query() . '" name="s" id="s" />
</span><del>- ' . get_submit_button( __( 'Search' ), '', 'searchsubmit', false ) . '
</del><ins>+ <input type="submit" id="searchsubmit" value="'. esc_attr__('Search') .'" />
</ins><span class="cx"> </div>
</span><span class="cx"> </form>';
</span><span class="cx">
</span><span class="lines">@@ -283,7 +283,7 @@
</span><span class="cx"> ' . apply_filters( 'login_form_middle', '' ) . '
</span><span class="cx"> ' . ( $args['remember'] ? '<p class="login-remember"><label><input name="rememberme" type="checkbox" id="' . esc_attr( $args['id_remember'] ) . '" value="forever" tabindex="90"' . ( $args['value_remember'] ? ' checked="checked"' : '' ) . ' /> ' . esc_html( $args['label_remember'] ) . '</label></p>' : '' ) . '
</span><span class="cx"> <p class="login-submit">
</span><del>- ' . get_submit_button( $args['label_log_in'], 'primary', 'wp-submit', false, array( 'id' => $args['id_submit'], 'tabindex' => 100 ) ) . '
</del><ins>+ <input type="submit" name="wp-submit" id="' . esc_attr( $args['id_submit'] ) . '" class="button-primary" value="' . esc_attr( $args['label_log_in'] ) . '" tabindex="100" />
</ins><span class="cx"> <input type="hidden" name="redirect_to" value="' . esc_attr( $args['redirect'] ) . '" />
</span><span class="cx"> </p>
</span><span class="cx"> ' . apply_filters( 'login_form_bottom', '' ) . '
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (16065 => 16066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2010-10-28 22:15:54 UTC (rev 16065)
+++ trunk/wp-includes/post-template.php 2010-10-29 00:31:27 UTC (rev 16066)
</span><span class="lines">@@ -1025,11 +1025,7 @@
</span><span class="cx"> $label = 'pwbox-'.(empty($post->ID) ? rand() : $post->ID);
</span><span class="cx"> $output = '<form action="' . get_option('siteurl') . '/wp-pass.php" method="post">
</span><span class="cx"> <p>' . __("This post is password protected. To view it please enter your password below:") . '</p>
</span><del>- <p>
- <label for="' . $label . '">' . __("Password:") . '
- <input name="post_password" id="' . $label . '" type="password" size="20" />
- </label>' . get_submit_button( __( 'Submit' ), '', 'Submit', false ) . '
- </p>
</del><ins>+ <p><label for="' . $label . '">' . __("Password:") . ' <input name="post_password" id="' . $label . '" type="password" size="20" /></label> <input type="submit" name="Submit" value="' . esc_attr__("Submit") . '" /></p>
</ins><span class="cx"> </form>
</span><span class="cx"> ';
</span><span class="cx"> return apply_filters('the_password_form', $output);
</span><span class="lines">@@ -1212,7 +1208,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="tablenav">
</span><span class="cx"> <div class="alignleft">
</span><del>- <?php submit_button( __( 'Compare Revisions' ), 'secondary', '', false ); ?>
</del><ins>+ <input type="submit" class="button-secondary" value="<?php esc_attr_e( 'Compare Revisions' ); ?>" />
</ins><span class="cx"> <input type="hidden" name="action" value="diff" />
</span><span class="cx"> <input type="hidden" name="post_type" value="<?php echo esc_attr($post->post_type); ?>" />
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (16065 => 16066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-10-28 22:15:54 UTC (rev 16065)
+++ trunk/wp-includes/post.php 2010-10-29 00:31:27 UTC (rev 16066)
</span><span class="lines">@@ -5123,14 +5123,14 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $submit_fields = array(
</span><del>- 'save' => get_submit_button( __( 'Save Draft' ), 'button', 'save', false, array( 'id' => 'save-post', 'tabindex' => '%s' ) ),
</del><ins>+ 'save' => '<input type="submit" name="save" id="save-post" class="button" tabindex="%s" value="'. esc_attr('Save Draft') .'" />',
</ins><span class="cx"> 'reset' => '<input type="reset" tabindex="%s" value="'. esc_attr( 'Reset' ).'" class="button" />',
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $publishing_action = current_user_can('publish_posts') ? esc_attr('Publish') : esc_attr('Submit for Review');
</span><span class="cx">
</span><span class="cx"> $publishing_fields = array(
</span><del>- 'submit' => get_submit_button( $publishing_action, 'primary', 'publish', false, array( 'accesskey' => 'p', 'tabindex' => '%s' ) ),
</del><ins>+ 'submit' => '<input type="submit" name="publish" id="publish" accesskey="p" tabindex="%s" class="button-primary" value="' . $publishing_action . '" />',
</ins><span class="cx"> /*'test' => '<input type="submit" name="publish" id="publish" accesskey="p" tabindex="%n" class="button-primary" value="'. esc_attr('Publish') .'" />', */
</span><span class="cx">
</span><span class="cx"> );
</span></span></pre></div>
<a id="trunkwpincludesthemecompatcommentspopupphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme-compat/comments-popup.php (16065 => 16066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme-compat/comments-popup.php 2010-10-28 22:15:54 UTC (rev 16065)
+++ trunk/wp-includes/theme-compat/comments-popup.php 2010-10-29 00:31:27 UTC (rev 16066)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> <p>
</span><span class="cx"> <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
</span><span class="cx"> <input type="hidden" name="redirect_to" value="<?php echo esc_attr($_SERVER["REQUEST_URI"]); ?>" />
</span><del>- <?php submit_button( __( 'Say It!' ), '', 'submit', false, array( 'tabindex' => '5' ) ); ?>
</del><ins>+ <input name="submit" type="submit" tabindex="5" value="<?php _e('Say It!' ); ?>" />
</ins><span class="cx"> </p>
</span><span class="cx"> <?php do_action('comment_form', $post->ID); ?>
</span><span class="cx"> </form>
</span></span></pre></div>
<a id="trunkwpincludesthemecompatcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme-compat/comments.php (16065 => 16066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme-compat/comments.php 2010-10-28 22:15:54 UTC (rev 16065)
+++ trunk/wp-includes/theme-compat/comments.php 2010-10-29 00:31:27 UTC (rev 16066)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">
</span><span class="cx"> <p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p>
</span><span class="cx">
</span><del>-<p><?php submit_button( __( 'Submit Comment' ), '', 'submit', false, array( 'tabindex' => '5' ) ); ?>
</del><ins>+<p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment'); ?>" />
</ins><span class="cx"> <?php comment_id_fields(); ?>
</span><span class="cx"> </p>
</span><span class="cx"> <?php do_action('comment_form', $post->ID); ?>
</span></span></pre></div>
<a id="trunkwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-login.php (16065 => 16066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-login.php 2010-10-28 22:15:54 UTC (rev 16065)
+++ trunk/wp-login.php 2010-10-29 00:31:27 UTC (rev 16066)
</span><span class="lines">@@ -411,7 +411,7 @@
</span><span class="cx"> </p>
</span><span class="cx"> <?php do_action('lostpassword_form'); ?>
</span><span class="cx"> <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
</span><del>- <?php submit_button( __( 'Get New Password' ), 'primary', 'wp-submit', true, array( 'tabindex' => '100' ) ); ?>
</del><ins>+ <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button-primary" value="<?php esc_attr_e('Get New Password'); ?>" tabindex="100" /></p>
</ins><span class="cx"> </form>
</span><span class="cx">
</span><span class="cx"> <p id="nav">
</span><span class="lines">@@ -467,7 +467,7 @@
</span><span class="cx"> <p class="description indicator-hint"><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
</span><span class="cx">
</span><span class="cx"> <br class="clear" />
</span><del>- <?php submit_button( __( 'Reset Password' ), 'primary', 'wp-submit', true, array( 'tabindex' => '100' ) ); ?>
</del><ins>+ <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button-primary" value="<?php esc_attr_e('Reset Password'); ?>" tabindex="100" /></p>
</ins><span class="cx"> </form>
</span><span class="cx">
</span><span class="cx"> <p id="nav">
</span><span class="lines">@@ -523,7 +523,7 @@
</span><span class="cx"> <p id="reg_passmail"><?php _e('A password will be e-mailed to you.') ?></p>
</span><span class="cx"> <br class="clear" />
</span><span class="cx"> <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
</span><del>- <?php submit_button( __( 'Register' ), 'primary', 'wp-submit', true, array( 'tabindex' => '100' ) ); ?>
</del><ins>+ <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button-primary" value="<?php esc_attr_e('Register'); ?>" tabindex="100" /></p>
</ins><span class="cx"> </form>
</span><span class="cx">
</span><span class="cx"> <p id="nav">
</span><span class="lines">@@ -640,7 +640,7 @@
</span><span class="cx"> <?php do_action('login_form'); ?>
</span><span class="cx"> <p class="forgetmenot"><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="90"<?php checked( $rememberme ); ?> /> <?php esc_attr_e('Remember Me'); ?></label></p>
</span><span class="cx"> <p class="submit">
</span><del>- <?php submit_button( __( 'Log In' ), 'primary', 'wp-submit', false, array( 'tabindex' => '100' ) ); ?>
</del><ins>+ <input type="submit" name="wp-submit" id="wp-submit" class="button-primary" value="<?php esc_attr_e('Log In'); ?>" tabindex="100" />
</ins><span class="cx"> <?php if ( $interim_login ) { ?>
</span><span class="cx"> <input type="hidden" name="interim-login" value="1" />
</span><span class="cx"> <?php } else { ?>
</span></span></pre></div>
<a id="trunkwpsignupphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-signup.php (16065 => 16066)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-signup.php 2010-10-28 22:15:54 UTC (rev 16065)
+++ trunk/wp-signup.php 2010-10-29 00:31:27 UTC (rev 16066)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> <input type="hidden" name="stage" value="gimmeanotherblog" />
</span><span class="cx"> <?php do_action( "signup_hidden_fields" ); ?>
</span><span class="cx"> <?php show_blog_form($blogname, $blog_title, $errors); ?>
</span><del>- <?php submit_button( __( 'Create Site' ), 'submit', 'submit' ); ?>
</del><ins>+ <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e( 'Create Site' ) ?>" /></p>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </p>
</span><span class="cx">
</span><del>- <?php submit_button( __( 'Next' ), 'submit', 'submit' ); ?>
</del><ins>+ <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Next') ?>" /></p>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="lines">@@ -326,7 +326,7 @@
</span><span class="cx"> <input type="hidden" name="user_email" value="<?php echo esc_attr($user_email) ?>" />
</span><span class="cx"> <?php do_action( "signup_hidden_fields" ); ?>
</span><span class="cx"> <?php show_blog_form($blogname, $blog_title, $errors); ?>
</span><del>- <?php submit_button( __( 'Signup' ), 'submit', 'submit', true ); ?>
</del><ins>+ <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Signup') ?>" /></p>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>