Changeset 42343 for trunk/src/wp-includes/theme-compat/comments.php

Timestamp:

11/30/2017 11:09:33 PM (7 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

• trunk/src/wp-includes/theme-compat/comments.php (modified) (4 diffs)

trunk/src/wp-includes/theme-compat/comments.php

@@ -6 +6 @@
  *
  * This file is here for backward compatibility with old themes and will be removed in a future version
- *
  */
 _deprecated_file(
@@ -18 +17 @@
 
 // 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 ( ! 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>
+if ( post_password_required() ) { ?>
+        <p class="nocomments"><?php _e( 'This post is password protected. Enter the password to view comments.' ); ?></p>
     <?php
-        return;
-    }
+    return;
+}
 ?>
 
@@ -33 +33 @@
     <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;' );
-            }
+        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>
-        <div class="alignright"><?php next_comments_link() ?></div>
+        <div class="alignleft"><?php previous_comments_link(); ?></div>
+        <div class="alignright"><?php next_comments_link(); ?></div>
     </div>
 
     <ol class="commentlist">
-    <?php wp_list_comments();?>
+    <?php wp_list_comments(); ?>
     </ol>
 
     <div class="navigation">
-        <div class="alignleft"><?php previous_comments_link() ?></div>
-        <div class="alignright"><?php next_comments_link() ?></div>
+        <div class="alignleft"><?php previous_comments_link(); ?></div>
+        <div class="alignright"><?php next_comments_link(); ?></div>
     </div>
 <?php else : // this is displayed if there are no comments so far ?>
@@ -64 +66 @@
     <?php else : // comments are closed ?>
         <!-- If comments are closed. -->
-        <p class="nocomments"><?php _e('Comments are closed.'); ?></p>
+        <p class="nocomments"><?php _e( 'Comments are closed.' ); ?></p>
 
     <?php endif; ?>