Changeset 42343 for trunk/src/wp-admin/edit-form-comment.php

Timestamp:

11/30/2017 11:09:33 PM (8 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-admin/edit-form-comment.php (modified) (14 diffs)

trunk/src/wp-admin/edit-form-comment.php

@@ -8 +8 @@
 
 // don't load directly
-if ( !defined('ABSPATH') )
-    die('-1');
+if ( ! defined( 'ABSPATH' ) ) {
+    die( '-1' );
+}
 ?>
 <form name="post" action="comment.php" method="post" id="post">
-<?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
+<?php wp_nonce_field( 'update-comment_' . $comment->comment_ID ); ?>
 <div class="wrap">
 <h1><?php _e( 'Edit Comment' ); ?></h1>
@@ -37 +38 @@
 <div class="inside">
 <fieldset>
-<legend class="edit-comment-author"><?php _e( 'Author' ) ?></legend>
+<legend class="edit-comment-author"><?php _e( 'Author' ); ?></legend>
 <table class="form-table editcomment">
 <tbody>
@@ -53 +54 @@
     <td class="first"><label for="newcomment_author_url"><?php _e( 'URL:' ); ?></label></td>
     <td>
-        <input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" class="code" value="<?php echo esc_attr($comment->comment_author_url); ?>" />
+        <input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" class="code" value="<?php echo esc_attr( $comment->comment_author_url ); ?>" />
     </td>
 </tr>
@@ -67 +68 @@
     echo '<label for="content" class="screen-reader-text">' . __( 'Comment' ) . '</label>';
     $quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
-    wp_editor( $comment->comment_content, 'content', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
-    wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
+    wp_editor(
+        $comment->comment_content, 'content', array(
+            'media_buttons' => false,
+            'tinymce'       => false,
+            'quicktags'     => $quicktags_settings,
+        )
+    );
+    wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
+    ?>
 </div>
 </div><!-- /post-body-content -->
@@ -74 +82 @@
 <div id="postbox-container-1" class="postbox-container">
 <div id="submitdiv" class="stuffbox" >
-<h2><?php _e( 'Status' ) ?></h2>
+<h2><?php _e( 'Status' ); ?></h2>
 <div class="inside">
 <div class="submitbox" id="submitcomment">
@@ -93 +101 @@
 $datef = __( 'M j, Y @ H:i' );
 ?>
-<span id="timestamp"><?php
+<span id="timestamp">
+<?php
 printf(
     /* translators: %s: comment date */
@@ -99 +108 @@
     '<b>' . date_i18n( $datef, strtotime( $comment->comment_date ) ) . '</b>'
 );
-?></span>
+?>
+</span>
 <a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit date and time' ); ?></span></a>
 <fieldset id='timestampdiv' class='hide-if-js'>
@@ -110 +120 @@
 $post_id = $comment->comment_post_ID;
 if ( current_user_can( 'edit_post', $post_id ) ) {
-    $post_link = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
+    $post_link  = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
     $post_link .= esc_html( get_the_title( $post_id ) ) . '</a>';
 } else {
@@ -118 +128 @@
 
 <div class="misc-pub-section misc-pub-response-to">
-    <?php printf(
+    <?php
+    printf(
         /* translators: %s: post link */
         __( 'In response to: %s' ),
         '<b>' . $post_link . '</b>'
-    ); ?>
+    );
+    ?>
 </div>
 
 <?php
 if ( $comment->comment_parent ) :
-    $parent      = get_comment( $comment->comment_parent );
+    $parent = get_comment( $comment->comment_parent );
     if ( $parent ) :
         $parent_link = esc_url( get_comment_link( $parent ) );
@@ -133 +145 @@
     ?>
     <div class="misc-pub-section misc-pub-reply-to">
-        <?php printf(
+        <?php
+        printf(
             /* translators: %s: comment link */
             __( 'In reply to: %s' ),
             '<b><a href="' . $parent_link . '">' . $name . '</a></b>'
-        ); ?>
+        );
+        ?>
     </div>
-<?php endif;
-endif; ?>
+<?php
+endif;
+endif;
+?>
 
 <?php
@@ -160 +176 @@
 <div id="major-publishing-actions">
 <div id="delete-action">
-<?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url("comment.php?action=" . ( !EMPTY_TRASH_DAYS ? 'deletecomment' : 'trashcomment' ) . "&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode(wp_get_referer()), 'delete-comment_' . $comment->comment_ID) . "'>" . ( !EMPTY_TRASH_DAYS ? __('Delete Permanently') : __('Move to Trash') ) . "</a>\n"; ?>
+<?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url( 'comment.php?action=' . ( ! EMPTY_TRASH_DAYS ? 'deletecomment' : 'trashcomment' ) . "&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode( wp_get_referer() ), 'delete-comment_' . $comment->comment_ID ) . "'>" . ( ! EMPTY_TRASH_DAYS ? __( 'Delete Permanently' ) : __( 'Move to Trash' ) ) . "</a>\n"; ?>
 </div>
 <div id="publishing-action">
@@ -186 +202 @@
 do_action( 'add_meta_boxes_comment', $comment );
 
-do_meta_boxes(null, 'normal', $comment);
+do_meta_boxes( null, 'normal', $comment );
 
 $referer = wp_get_referer();
@@ -192 +208 @@
 </div>
 
-<input type="hidden" name="c" value="<?php echo esc_attr($comment->comment_ID) ?>" />
-<input type="hidden" name="p" value="<?php echo esc_attr($comment->comment_post_ID) ?>" />
+<input type="hidden" name="c" value="<?php echo esc_attr( $comment->comment_ID ); ?>" />
+<input type="hidden" name="p" value="<?php echo esc_attr( $comment->comment_post_ID ); ?>" />
 <input name="referredby" type="hidden" id="referredby" value="<?php echo $referer ? esc_url( $referer ) : ''; ?>" />
-<?php wp_original_referer_field(true, 'previous'); ?>
+<?php wp_original_referer_field( true, 'previous' ); ?>
 <input type="hidden" name="noredir" value="1" />
 
@@ -207 +223 @@
 try{document.post.name.focus();}catch(e){}
 </script>
-<?php endif;
+<?php
+endif;