Theme Compat: Replace the custom comment form with `comment_form()` and reduce number of links.
`comment_form()` has nearly the same markup as the custom form but also includes the latest enhancements like improved a11y and more filters. Add translators comments, props ramiy. Fixes #35888. Built from https://develop.svn.wordpress.org/trunk@36595 git-svn-id: http://core.svn.wordpress.org/trunk@36562 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling
parent
26955c8507
commit
21b9965613
|
|
@ -68,54 +68,4 @@ _deprecated_file(
|
|||
<?php endif; ?>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php if ( comments_open() ) : ?>
|
||||
|
||||
<div id="respond">
|
||||
|
||||
<h3><?php comment_form_title( __('Leave a Reply'), __('Leave a Reply to %s' ) ); ?></h3>
|
||||
|
||||
<div id="cancel-comment-reply">
|
||||
<small><?php cancel_comment_reply_link() ?></small>
|
||||
</div>
|
||||
|
||||
<?php if ( get_option('comment_registration') && !is_user_logged_in() ) : ?>
|
||||
<p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.'), wp_login_url( get_permalink() )); ?></p>
|
||||
<?php else : ?>
|
||||
|
||||
<form action="<?php echo site_url(); ?>/wp-comments-post.php" method="post" id="commentform">
|
||||
|
||||
<?php if ( is_user_logged_in() ) : ?>
|
||||
|
||||
<p><?php /* translators: %s: user profile link */
|
||||
printf( __( 'Logged in as %s.' ), sprintf( '<a href="%1$s">%2$s</a>', get_edit_user_link(), $user_identity ) ); ?>
|
||||
<a href="<?php echo wp_logout_url( get_permalink() ); ?>" title="<?php esc_attr_e( 'Log out of this account' ); ?>"><?php _e( 'Log out »' ); ?></a></p>
|
||||
|
||||
<?php else : ?>
|
||||
|
||||
<p><input type="text" name="author" id="author" value="<?php echo esc_attr($comment_author); ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> />
|
||||
<label for="author"><small><?php _e('Name'); ?> <?php if ($req) _e('(required)'); ?></small></label></p>
|
||||
|
||||
<p><input type="text" name="email" id="email" value="<?php echo esc_attr($comment_author_email); ?>" size="22" tabindex="2" <?php if ($req) echo "aria-required='true'"; ?> />
|
||||
<label for="email"><small><?php _e('Mail (will not be published)'); ?> <?php if ($req) _e('(required)'); ?></small></label></p>
|
||||
|
||||
<p><input type="text" name="url" id="url" value="<?php echo esc_attr($comment_author_url); ?>" size="22" tabindex="3" />
|
||||
<label for="url"><small><?php _e('Website'); ?></small></label></p>
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
<p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p>
|
||||
|
||||
<p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php esc_attr_e('Submit Comment'); ?>" />
|
||||
<?php comment_id_fields(); ?>
|
||||
</p>
|
||||
<?php
|
||||
/** This filter is documented in wp-includes/comment-template.php */
|
||||
do_action( 'comment_form', $post->ID );
|
||||
?>
|
||||
|
||||
</form>
|
||||
|
||||
<?php endif; // If registration required and not logged in ?>
|
||||
</div>
|
||||
|
||||
<?php endif; // if you delete this the sky will fall on your head ?>
|
||||
<?php comment_form(); ?>
|
||||
|
|
|
|||
|
|
@ -21,10 +21,14 @@ _deprecated_file(
|
|||
<div id="footer" role="contentinfo">
|
||||
<!-- If you'd like to support WordPress, having the "powered by" link somewhere on your blog is the best way; it's our only promotion or advertising. -->
|
||||
<p>
|
||||
<?php printf(__('%1$s is proudly powered by %2$s'), get_bloginfo('name'),
|
||||
'<a href="https://wordpress.org/">WordPress</a>'); ?>
|
||||
<br /><?php printf(__('%1$s and %2$s.'), '<a href="' . get_bloginfo('rss2_url') . '">' . __('Entries (RSS)') . '</a>', '<a href="' . get_bloginfo('comments_rss2_url') . '">' . __('Comments (RSS)') . '</a>'); ?>
|
||||
<!-- <?php printf(__('%d queries. %s seconds.'), get_num_queries(), timer_stop(0, 3)); ?> -->
|
||||
<?php
|
||||
printf(
|
||||
/* translators: 1: blog name, 2: WordPress */
|
||||
__( '%1$s is proudly powered by %2$s' ),
|
||||
get_bloginfo('name'),
|
||||
'<a href="https://wordpress.org/">WordPress</a>'
|
||||
);
|
||||
?>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ _deprecated_file(
|
|||
printf( __( 'You have searched the %1$s blog archives for <strong>‘%2$s’</strong>. If you are unable to find anything in these search results, you can try one of these links.' ),
|
||||
sprintf( '<a href="%1$s/">%2$s</a>', get_bloginfo( 'url' ), get_bloginfo( 'name' ) ),
|
||||
esc_html( get_search_query() )
|
||||
);
|
||||
);
|
||||
?></p>
|
||||
|
||||
<?php elseif ( isset( $_GET['paged'] ) && ! empty( $_GET['paged'] ) ) : /* If this set is paginated */ ?>
|
||||
|
|
@ -105,9 +105,6 @@ _deprecated_file(
|
|||
<ul>
|
||||
<?php wp_register(); ?>
|
||||
<li><?php wp_loginout(); ?></li>
|
||||
<li><a href="http://validator.w3.org/check/referer" title="<?php esc_attr_e('This page validates as XHTML 1.0 Transitional'); ?>"><?php _e('Valid <abbr title="eXtensible HyperText Markup Language">XHTML</abbr>'); ?></a></li>
|
||||
<li><a href="http://gmpg.org/xfn/"><abbr title="<?php esc_attr_e('XHTML Friends Network'); ?>"><?php _e('XFN'); ?></abbr></a></li>
|
||||
<li><a href="https://wordpress.org/" title="<?php esc_attr_e('Powered by WordPress, state-of-the-art semantic personal publishing platform.'); ?>">WordPress</a></li>
|
||||
<?php wp_meta(); ?>
|
||||
</ul>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '4.5-alpha-36594';
|
||||
$wp_version = '4.5-alpha-36595';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
|
|
|||
Loading…
Reference in New Issue