Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 17:18:32 +01:00
Code Issues Projects Releases Wiki Activity

Revert submit_button() for wp-includes, setup-config, install, login, signup. see [16061], see #15064, fixes #15247.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16066 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-10-29 00:31:27 +00:00
parent c83e1d1ef3
commit 0552424317
10 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/install.php
View File

@ -133,7 +133,7 @@ function display_setup_form( $error = null ) {
<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>
</tr>
</table>
<p class="step"><?php submit_button( __( 'Install WordPress' ), 'button', 'Submit', false ); ?></p>
<p class="step"><input type="submit" name="Submit" value="<?php esc_attr_e( 'Install WordPress' ); ?>" class="button" /></p>
</form>
<?php
} // end display_setup_form()

2
wp-admin/setup-config.php
View File

@ -146,7 +146,7 @@ switch($step) {
</tr>
</table>
<?php if ( isset( $_GET['noapi'] ) ) { ?><input name="noapi" type="hidden" value="true" /><?php } ?>
<p class="step"><?php submit_button( __( 'Submit' ), 'button', 'submit', false ); ?></p>
<p class="step"><input name="submit" type="submit" value="Submit" class="button" /></p>
</form>
<?php
break;

2
wp-includes/comment-template.php
View File

@ -1572,7 +1572,7 @@ function comment_form( $args = array(), $post_id = null ) {
<?php echo apply_filters( 'comment_form_field_comment', $args['comment_field'] ); ?>
<?php echo $args['comment_notes_after']; ?>
<p class="form-submit">
<?php submit_button( $args['label_submit'], 'button', 'submit', false, array( 'id' => $args['id_submit'] ) ); ?>
<input name="submit" type="submit" id="<?php echo esc_attr( $args['id_submit'] ); ?>" value="<?php echo esc_attr( $args['label_submit'] ); ?>" />
<?php comment_id_fields(); ?>
</p>
<?php do_action( 'comment_form', $post_id ); ?>

4
wp-includes/general-template.php
View File

@ -160,7 +160,7 @@ function get_search_form($echo = true) {
$form = '<form role="search" method="get" id="searchform" action="' . home_url( '/' ) . '" >
<div><label class="screen-reader-text" for="s">' . __('Search for:') . '</label>
<input type="text" value="' . get_search_query() . '" name="s" id="s" />
' . get_submit_button( __( 'Search' ), '', 'searchsubmit', false ) . '
<input type="submit" id="searchsubmit" value="'. esc_attr__('Search') .'" />
</div>
</form>';
@ -283,7 +283,7 @@ function wp_login_form( $args = array() ) {
' . apply_filters( 'login_form_middle', '' ) . '
' . ( $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>' : '' ) . '
<p class="login-submit">
' . get_submit_button( $args['label_log_in'], 'primary', 'wp-submit', false, array( 'id' => $args['id_submit'], 'tabindex' => 100 ) ) . '
<input type="submit" name="wp-submit" id="' . esc_attr( $args['id_submit'] ) . '" class="button-primary" value="' . esc_attr( $args['label_log_in'] ) . '" tabindex="100" />
<input type="hidden" name="redirect_to" value="' . esc_attr( $args['redirect'] ) . '" />
</p>
' . apply_filters( 'login_form_bottom', '' ) . '

8
wp-includes/post-template.php
View File

@ -1025,11 +1025,7 @@ function get_the_password_form() {
$label = 'pwbox-'.(empty($post->ID) ? rand() : $post->ID);
$output = '<form action="' . get_option('siteurl') . '/wp-pass.php" method="post">
<p>' . __("This post is password protected. To view it please enter your password below:") . '</p>
<p>
<label for="' . $label . '">' . __("Password:") . '
<input name="post_password" id="' . $label . '" type="password" size="20" />
</label>' . get_submit_button( __( 'Submit' ), '', 'Submit', false ) . '
</p>
<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>
</form>
';
return apply_filters('the_password_form', $output);
@ -1212,7 +1208,7 @@ function wp_list_post_revisions( $post_id = 0, $args = null ) {
<div class="tablenav">
<div class="alignleft">
<?php submit_button( __( 'Compare Revisions' ), 'secondary', '', false ); ?>
<input type="submit" class="button-secondary" value="<?php esc_attr_e( 'Compare Revisions' ); ?>" />
<input type="hidden" name="action" value="diff" />
<input type="hidden" name="post_type" value="<?php echo esc_attr($post->post_type); ?>" />
</div>

4
wp-includes/post.php
View File

@ -5123,14 +5123,14 @@ function wp_quickpress_form( $args = array(), $post_type = 'post'){
);
$submit_fields = array(
'save' => get_submit_button( __( 'Save Draft' ), 'button', 'save', false, array( 'id' => 'save-post', 'tabindex' => '%s' ) ),
'save' => '<input type="submit" name="save" id="save-post" class="button" tabindex="%s" value="'. esc_attr('Save Draft') .'" />',
'reset' => '<input type="reset" tabindex="%s" value="'. esc_attr( 'Reset' ).'" class="button" />',
);
$publishing_action = current_user_can('publish_posts') ? esc_attr('Publish') : esc_attr('Submit for Review');
$publishing_fields = array(
'submit' => get_submit_button( $publishing_action, 'primary', 'publish', false, array( 'accesskey' => 'p', 'tabindex' => '%s' ) ),
'submit' => '<input type="submit" name="publish" id="publish" accesskey="p" tabindex="%s" class="button-primary" value="' . $publishing_action . '" />',
/*'test' => '<input type="submit" name="publish" id="publish" accesskey="p" tabindex="%n" class="button-primary" value="'. esc_attr('Publish') .'" />', */
);

2
wp-includes/theme-compat/comments-popup.php
View File

@ -95,7 +95,7 @@ if ( post_password_required($post) ) { // and it doesn't match the cookie
<p>
<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
<input type="hidden" name="redirect_to" value="<?php echo esc_attr($_SERVER["REQUEST_URI"]); ?>" />
<?php submit_button( __( 'Say It!' ), '', 'submit', false, array( 'tabindex' => '5' ) ); ?>
<input name="submit" type="submit" tabindex="5" value="<?php _e('Say It!' ); ?>" />
</p>
<?php do_action('comment_form', $post->ID); ?>
</form>

2
wp-includes/theme-compat/comments.php
View File

@ -89,7 +89,7 @@ _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.
<p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p>
<p><?php submit_button( __( 'Submit Comment' ), '', 'submit', false, array( 'tabindex' => '5' ) ); ?>
<p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment'); ?>" />
<?php comment_id_fields(); ?>
</p>
<?php do_action('comment_form', $post->ID); ?>

8
wp-login.php
View File

@ -411,7 +411,7 @@ case 'retrievepassword' :
</p>
<?php do_action('lostpassword_form'); ?>
<input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
<?php submit_button( __( 'Get New Password' ), 'primary', 'wp-submit', true, array( 'tabindex' => '100' ) ); ?>
<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>
</form>
<p id="nav">
@ -467,7 +467,7 @@ case 'rp' :
<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>
<br class="clear" />
<?php submit_button( __( 'Reset Password' ), 'primary', 'wp-submit', true, array( 'tabindex' => '100' ) ); ?>
<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>
</form>
<p id="nav">
@ -523,7 +523,7 @@ case 'register' :
<p id="reg_passmail"><?php _e('A password will be e-mailed to you.') ?></p>
<br class="clear" />
<input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
<?php submit_button( __( 'Register' ), 'primary', 'wp-submit', true, array( 'tabindex' => '100' ) ); ?>
<p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button-primary" value="<?php esc_attr_e('Register'); ?>" tabindex="100" /></p>
</form>
<p id="nav">
@ -640,7 +640,7 @@ default:
<?php do_action('login_form'); ?>
<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>
<p class="submit">
<?php submit_button( __( 'Log In' ), 'primary', 'wp-submit', false, array( 'tabindex' => '100' ) ); ?>
<input type="submit" name="wp-submit" id="wp-submit" class="button-primary" value="<?php esc_attr_e('Log In'); ?>" tabindex="100" />
<?php if ( $interim_login ) { ?>
<input type="hidden" name="interim-login" value="1" />
<?php } else { ?>

6
wp-signup.php
View File

@ -191,7 +191,7 @@ function signup_another_blog($blogname = '', $blog_title = '', $errors = '') {
<input type="hidden" name="stage" value="gimmeanotherblog" />
<?php do_action( "signup_hidden_fields" ); ?>
<?php show_blog_form($blogname, $blog_title, $errors); ?>
<?php submit_button( __( 'Create Site' ), 'submit', 'submit' ); ?>
<p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e( 'Create Site' ) ?>" /></p>
</form>
<?php
}
@ -270,7 +270,7 @@ function signup_user($user_name = '', $user_email = '', $errors = '') {
<?php } ?>
</p>
<?php submit_button( __( 'Next' ), 'submit', 'submit' ); ?>
<p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Next') ?>" /></p>
</form>
<?php
}
@ -326,7 +326,7 @@ function signup_blog($user_name = '', $user_email = '', $blogname = '', $blog_ti
<input type="hidden" name="user_email" value="<?php echo esc_attr($user_email) ?>" />
<?php do_action( "signup_hidden_fields" ); ?>
<?php show_blog_form($blogname, $blog_title, $errors); ?>
<?php submit_button( __( 'Signup' ), 'submit', 'submit', true ); ?>
<p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Signup') ?>" /></p>
</form>
<?php
}