WordPress 4.2

[autoinstalls/wordpress.git] / wp-includes / theme-compat / comments.php

diff --git a/wp-includes/theme-compat/comments.php b/wp-includes/theme-compat/comments.php
index 89a888c75d9c99cb91d85afd18b07f52f12a7e29..d46c0419cd415706acc959f3a9ac74e60acdb4c2 100644 (file)
--- a/wp-includes/theme-compat/comments.php
+++ b/wp-includes/theme-compat/comments.php
@@ -23,8 +23,18 @@ _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.
 <!-- You can start editing here. -->
 
 <?php if ( have_comments() ) : ?>
-       <h3 id="comments"><?php printf( _n( 'One Response to %2$s', '%1$s Responses to %2$s', get_comments_number() ),
-                                                                       number_format_i18n( get_comments_number() ), '&#8220;' . get_the_title() . '&#8221;' ); ?></h3>
+       <h3 id="comments">
+               <?php
+                       if ( 1 == get_comments_number() ) {
+                               /* translators: %s: post title */
+                               printf( __( 'One Response to %s' ),  '&#8220;' . get_the_title() . '&#8221;' );
+                       } else {
+                               /* translators: 1: number of comments, 2: post title */
+                               printf( _n( '%1$s Response to %2$s', '%1$s Responses to %2$s', get_comments_number() ),
+                                       number_format_i18n( get_comments_number() ),  '&#8220;' . get_the_title() . '&#8221;' );
+                       }
+               ?>
+       </h3>
 
        <div class="navigation">
                <div class="alignleft"><?php previous_comments_link() ?></div>
@@ -65,11 +75,11 @@ _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.
 <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 get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
+<form action="<?php echo site_url(); ?>/wp-comments-post.php" method="post" id="commentform">
 
 <?php if ( is_user_logged_in() ) : ?>
 
-<p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.'), get_option('siteurl') . '/wp-admin/profile.php', $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 &raquo;'); ?></a></p>
+<p><?php printf(__('Logged in as <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 &raquo;'); ?></a></p>
 
 <?php else : ?>
 
@@ -91,7 +101,10 @@ _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.
 <p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php esc_attr_e('Submit Comment'); ?>" />
 <?php comment_id_fields(); ?>
 </p>
-<?php do_action('comment_form', $post->ID); ?>
+<?php
+/** This filter is documented in wp-includes/comment-template.php */
+do_action( 'comment_form', $post->ID );
+?>
 
 </form>