WordPress 4.2.4-scripts

[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 b095d51c75be0082583083fbfc99eb26aa355cbc..d46c0419cd415706acc959f3a9ac74e60acdb4c2 100644 (file)
--- a/wp-includes/theme-compat/comments.php
+++ b/wp-includes/theme-compat/comments.php
@@ -3,18 +3,18 @@
  * @package WordPress
  * @subpackage Theme_Compat
  * @deprecated 3.0
- * 
+ *
  * This file is here for Backwards compatibility with old themes and will be removed in a future version
- * 
+ *
  */
 _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) );
 
 // Do not delete these lines
        if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']))
                die ('Please do not load this page directly. Thanks!');
-       
+
        if ( post_password_required() ) { ?>
-               <p class="nocomments"><?php _e('This post is password protected. Enter the password to view comments.'); ?></p> 
+               <p class="nocomments"><?php _e('This post is password protected. Enter the password to view comments.'); ?></p>
        <?php
                return;
        }
@@ -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>
@@ -51,26 +61,25 @@ _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.
        <?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"> 
+<div id="cancel-comment-reply">
        <small><?php cancel_comment_reply_link() ?></small>
-</div> 
+</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 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 _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 : ?>
 
@@ -89,10 +98,13 @@ _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><input name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment'); ?>" />
-<?php comment_id_fields(); ?> 
+<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>