Ticket #26687: comment-template.diff

wp-includes/comment-template.php

@@ -26 +26 @@
                 if ( $comment->user_id && $user = get_userdata( $comment->user_id ) )
                         $author = $user->display_name;
                 else
-                        $author = __('Anonymous');
+                        $author = __( 'Anonymous' );
         } else {
                 $author = $comment->comment_author;
         }
@@ -158 +158 @@
          * @param string $comment->comment_author_email The comment author's email address.
          */
         $email = apply_filters( 'comment_email', $comment->comment_author_email );
-        if ((!empty($email)) && ($email != '@')) {
-        $display = ($linktext != '') ? $linktext : $email;
+        if ( ( !empty( $email ) ) && ( $email != '@' ) ) {
+                $display = ( $linktext != '' ) ? $linktext : $email;
                 $return  = $before;
                 $return .= "<a href='mailto:$email'>$display</a>";
-                $return .= $after;
+                $return .= $after;
                 return $return;
         } else {
                 return '';
@@ -253 +253 @@
  */
 function get_comment_author_url( $comment_ID = 0 ) {
         $comment = get_comment( $comment_ID );
-        $url = ('http://' == $comment->comment_author_url) ? '' : $comment->comment_author_url;
-        $url = esc_url( $url, array('http', 'https') );
+        $url = ( 'http://' == $comment->comment_author_url ) ? '' : $comment->comment_author_url;
+        $url = esc_url( $url, array( 'http', 'https' ) );
         /**
          * Filter the comment author's URL.
          *
@@ -303 +303 @@
  */
 function get_comment_author_url_link( $linktext = '', $before = '', $after = '' ) {
         $url = get_comment_author_url();
-        $display = ($linktext != '') ? $linktext : $url;
+        $display = ( $linktext != '' ) ? $linktext : $url;
         $display = str_replace( 'http://www.', '', $display );
         $display = str_replace( 'http://', '', $display );
-        if ( '/' == substr($display, -1) )
-                $display = substr($display, 0, -1);
+        if ( '/' == substr( $display, -1 ) )
+                $display = substr( $display, 0, -1 );
         $return = "$before<a href='$url' rel='external'>$display</a>$after";
 
         /**
@@ -346 +346 @@
 function comment_class( $class = '', $comment_id = null, $post_id = null, $echo = true ) {
         // Separates classes with a single space, collates classes for comment DIV
         $class = 'class="' . join( ' ', get_comment_class( $class, $comment_id, $post_id ) ) . '"';
-        if ( $echo)
+        if ( $echo )
                 echo $class;
         else
                 return $class;
@@ -365 +365 @@
 function get_comment_class( $class = '', $comment_id = null, $post_id = null ) {
         global $comment_alt, $comment_depth, $comment_thread_alt;
 
-        $comment = get_comment($comment_id);
+        $comment = get_comment( $comment_id );
 
         $classes = array();
 
@@ -373 +373 @@
         $classes[] = ( empty( $comment->comment_type ) ) ? 'comment' : $comment->comment_type;
 
         // If the comment author has an id (registered), then print the log in name
-        if ( $comment->user_id > 0 && $user = get_userdata($comment->user_id) ) {
+        if ( $comment->user_id > 0 && $user = get_userdata( $comment->user_id ) ) {
                 // For all registered users, 'byuser'
                 $classes[] = 'byuser';
-                $classes[] = 'comment-author-' . sanitize_html_class($user->user_nicename, $comment->user_id);
+                $classes[] = 'comment-author-' . sanitize_html_class( $user->user_nicename, $comment->user_id );
                 // For comment authors who are the author of the post
-                if ( $post = get_post($post_id) ) {
+                if ( $post = get_post( $post_id ) ) {
                         if ( $comment->user_id === $post->post_author )
                                 $classes[] = 'bypostauthor';
                 }
         }
 
-        if ( empty($comment_alt) )
+        if ( empty( $comment_alt ) )
                 $comment_alt = 0;
-        if ( empty($comment_depth) )
+        if ( empty( $comment_depth ) )
                 $comment_depth = 1;
-        if ( empty($comment_thread_alt) )
+        if ( empty( $comment_thread_alt ) )
                 $comment_thread_alt = 0;
 
         if ( $comment_alt % 2 ) {
@@ -413 +413 @@
 
         $classes[] = "depth-$comment_depth";
 
-        if ( !empty($class) ) {
+        if ( !empty( $class ) ) {
                 if ( !is_array( $class ) )
-                        $class = preg_split('#\s+#', $class);
-                $classes = array_merge($classes, $class);
+                        $class = preg_split( '#\s+#', $class );
+                $classes = array_merge( $classes, $class );
         }
 
-        $classes = array_map('esc_attr', $classes);
+        $classes = array_map( 'esc_attr', $classes );
 
         /**
          * Filter the returned CSS classes for the current comment.
@@ -446 +446 @@
 function get_comment_date( $d = '', $comment_ID = 0 ) {
         $comment = get_comment( $comment_ID );
         if ( '' == $d )
-                $date = mysql2date(get_option('date_format'), $comment->comment_date);
+                $date = mysql2date( get_option( 'date_format' ), $comment->comment_date );
         else
-                $date = mysql2date($d, $comment->comment_date);
+                $date = mysql2date( $d, $comment->comment_date );
         /**
          * Filter the returned comment date.
          *
@@ -486 +486 @@
  */
 function get_comment_excerpt( $comment_ID = 0 ) {
         $comment = get_comment( $comment_ID );
-        $comment_text = strip_tags($comment->comment_content);
-        $blah = explode(' ', $comment_text);
-        if (count($blah) > 20) {
+        $comment_text = strip_tags( $comment->comment_content );
+        $blah = explode( ' ', $comment_text );
+        if ( count( $blah ) > 20 ) {
                 $k = 20;
                 $use_dotdotdot = 1;
         } else {
-                $k = count($blah);
+                $k = count( $blah );
                 $use_dotdotdot = 0;
         }
         $excerpt = '';
-        for ($i=0; $i<$k; $i++) {
+        for ( $i=0; $i<$k; $i++ ) {
                 $excerpt .= $blah[$i] . ' ';
         }
-        $excerpt .= ($use_dotdotdot) ? '&hellip;' : '';
-        return apply_filters('get_comment_excerpt', $excerpt);
+        $excerpt .= ( $use_dotdotdot ) ? '&hellip;' : '';
+        return apply_filters( 'get_comment_excerpt', $excerpt );
 }
 
 /**
@@ -511 +511 @@
  * @param int $comment_ID Optional. The ID of the comment for which to print the excerpt. Default current comment.
  */
 function comment_excerpt( $comment_ID = 0 ) {
-        $comment_excerpt = get_comment_excerpt($comment_ID);
+        $comment_excerpt = get_comment_excerpt( $comment_ID );
         /**
          * Filter the comment excerpt for display.
          *
@@ -562 +562 @@
 function get_comment_link( $comment = null, $args = array() ) {
         global $wp_rewrite, $in_comment_loop;
 
-        $comment = get_comment($comment);
+        $comment = get_comment( $comment );
 
         // Backwards compat
-        if ( !is_array($args) ) {
+        if ( !is_array( $args ) ) {
                 $page = $args;
                 $args = array();
                 $args['page'] = $page;
@@ -574 +574 @@
         $defaults = array( 'type' => 'all', 'page' => '', 'per_page' => '', 'max_depth' => '' );
         $args = wp_parse_args( $args, $defaults );
 
-        if ( '' === $args['per_page'] && get_option('page_comments') )
-                $args['per_page'] = get_option('comments_per_page');
+        if ( '' === $args['per_page'] && get_option( 'page_comments' ) )
+                $args['per_page'] = get_option( 'comments_per_page' );
 
-        if ( empty($args['per_page']) ) {
+        if ( empty( $args['per_page'] ) ) {
                 $args['per_page'] = 0;
                 $args['page'] = 0;
         }
 
         if ( $args['per_page'] ) {
                 if ( '' == $args['page'] )
-                        $args['page'] = ( !empty($in_comment_loop) ) ? get_query_var('cpage') : get_page_of_comment( $comment->comment_ID, $args );
+                        $args['page'] = ( !empty( $in_comment_loop ) ) ? get_query_var( 'cpage' ) : get_page_of_comment( $comment->comment_ID, $args );
 
                 if ( $wp_rewrite->using_permalinks() )
                         $link = user_trailingslashit( trailingslashit( get_permalink( $comment->comment_post_ID ) ) . 'comment-page-' . $args['page'], 'comment' );
@@ -658 +658 @@
         if ( !$post_id )
                 $post_id = get_the_ID();
 
-        $post = get_post($post_id);
-        if ( ! isset($post->comment_count) )
+        $post = get_post( $post_id );
+        if ( ! isset( $post->comment_count ) )
                 $count = 0;
         else
                 $count = $post->comment_count;
@@ -692 +692 @@
         $number = get_comments_number();
 
         if ( $number > 1 )
-                $output = str_replace('%', number_format_i18n($number), ( false === $more ) ? __('% Comments') : $more);
+                $output = str_replace( '%', number_format_i18n( $number ), ( false === $more ) ? __( '% Comments' ) : $more );
         elseif ( $number == 0 )
-                $output = ( false === $zero ) ? __('No Comments') : $zero;
+                $output = ( false === $zero ) ? __( 'No Comments' ) : $zero;
         else // must be one
-                $output = ( false === $one ) ? __('1 Comment') : $one;
+                $output = ( false === $one ) ? __( '1 Comment' ) : $one;
 
         /**
          * Filter the comments count for display.
@@ -773 +773 @@
         global $comment;
         $comment_date = $gmt ? $comment->comment_date_gmt : $comment->comment_date;
         if ( '' == $d )
-                $date = mysql2date(get_option('time_format'), $comment_date, $translate);
+                $date = mysql2date( get_option( 'time_format' ), $comment_date, $translate );
         else
-                $date = mysql2date($d, $comment_date, $translate);
+                $date = mysql2date( $d, $comment_date, $translate );
 
         /**
          * Filter the returned comment time.
@@ -798 +798 @@
  * @param string $d Optional. The format of the time. Default user's settings.
  */
 function comment_time( $d = '' ) {
-        echo get_comment_time($d);
+        echo get_comment_time( $d );
 }
 
 /**
@@ -862 +862 @@
  * @return string The trackback URL after being filtered.
  */
 function get_trackback_url() {
-        if ( '' != get_option('permalink_structure') )
-                $tb_url = trailingslashit(get_permalink()) . user_trailingslashit('trackback', 'single_trackback');
+        if ( '' != get_option( 'permalink_structure' ) )
+                $tb_url = trailingslashit( get_permalink() ) . user_trailingslashit( 'trackback', 'single_trackback' );
         else
-                $tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . get_the_ID();
+                $tb_url = get_option( 'siteurl' ) . '/wp-trackback.php?p=' . get_the_ID();
 
         /**
          * Filter the returned trackback URL.
@@ -887 +887 @@
  */
 function trackback_url( $deprecated_echo = true ) {
         if ( $deprecated_echo !== true )
-                _deprecated_argument( __FUNCTION__, '2.5', __('Use <code>get_trackback_url()</code> instead if you do not want the value echoed.') );
+                _deprecated_argument( __FUNCTION__, '2.5', __( 'Use <code>get_trackback_url()</code> instead if you do not want the value echoed.' ) );
         if ( $deprecated_echo )
                 echo get_trackback_url();
         else
@@ -907 +907 @@
         if ( !empty( $deprecated ) )
                 _deprecated_argument( __FUNCTION__, '2.5' );
 
-        if ( false !== stripos($_SERVER['HTTP_USER_AGENT'], 'W3C_Validator') )
+        if ( false !== stripos( $_SERVER['HTTP_USER_AGENT'], 'W3C_Validator' ) )
                 return;
 
         echo '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -919 +919 @@
         echo '    dc:identifier="';
         the_permalink();
         echo '"'."\n";
-        echo '    dc:title="'.str_replace('--', '&#x2d;&#x2d;', wptexturize(strip_tags(get_the_title()))).'"'."\n";
+        echo '    dc:title="'.str_replace( '--', '&#x2d;&#x2d;', wptexturize( strip_tags( get_the_title() ) ) ).'"'."\n";
         echo '    trackback:ping="'.get_trackback_url().'"'." />\n";
         echo '</rdf:RDF>';
 }
@@ -934 +934 @@
  */
 function comments_open( $post_id = null ) {
 
-        $_post = get_post($post_id);
+        $_post = get_post( $post_id );
 
         $open = ( 'open' == $_post->comment_status );
 
@@ -959 +959 @@
  */
 function pings_open( $post_id = null ) {
 
-        $_post = get_post($post_id);
+        $_post = get_post( $post_id );
 
         $open = ( 'open' == $_post->ping_status );
         return apply_filters( 'pings_open', $open, $post_id );
@@ -1017 +1017 @@
 function comments_template( $file = '/comments.php', $separate_comments = false ) {
         global $wp_query, $withcomments, $post, $wpdb, $id, $comment, $user_login, $user_ID, $user_identity, $overridden_cpage;
 
-        if ( !(is_single() || is_page() || $withcomments) || empty($post) )
+        if ( !( is_single() || is_page() || $withcomments ) || empty( $post ) )
                 return;
 
-        if ( empty($file) )
+        if ( empty( $file ) )
                 $file = '/comments.php';
 
-        $req = get_option('require_name_email');
+        $req = get_option( 'require_name_email' );
 
         /**
          * Comment author information fetched from the comment cookies.
@@ -1045 +1045 @@
         /**
          * The url of the current comment author escaped for use in attributes.
          */
-        $comment_author_url = esc_url($commenter['comment_author_url']);
+        $comment_author_url = esc_url( $commenter['comment_author_url'] );
 
         /** @todo Use API instead of SELECTs. */
         if ( $user_ID) {
-                $comments = $wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND (comment_approved = '1' OR ( user_id = %d AND comment_approved = '0' ) )  ORDER BY comment_date_gmt", $post->ID, $user_ID));
+                $comments = $wpdb->get_results($wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND (comment_approved = '1' OR ( user_id = %d AND comment_approved = '0' ) )  ORDER BY comment_date_gmt", $post->ID, $user_ID ) );
         } else if ( empty($comment_author) ) {
-                $comments = get_comments( array('post_id' => $post->ID, 'status' => 'approve', 'order' => 'ASC') );
+                $comments = get_comments( array( 'post_id' => $post->ID, 'status' => 'approve', 'order' => 'ASC' ) );
         } else {
-                $comments = $wpdb->get_results($wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND ( comment_approved = '1' OR ( comment_author = %s AND comment_author_email = %s AND comment_approved = '0' ) ) ORDER BY comment_date_gmt", $post->ID, wp_specialchars_decode($comment_author,ENT_QUOTES), $comment_author_email));
+                $comments = $wpdb->get_results($wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND ( comment_approved = '1' OR ( comment_author = %s AND comment_author_email = %s AND comment_approved = '0' ) ) ORDER BY comment_date_gmt", $post->ID, wp_specialchars_decode( $comment_author,ENT_QUOTES ), $comment_author_email ) );
         }
 
         // keep $comments for legacy's sake
@@ -1067 +1067 @@
          */
         $wp_query->comments = apply_filters( 'comments_array', $comments, $post->ID );
         $comments = &$wp_query->comments;
-        $wp_query->comment_count = count($wp_query->comments);
-        update_comment_cache($wp_query->comments);
+        $wp_query->comment_count = count( $wp_query->comments );
+        update_comment_cache( $wp_query->comments );
 
         if ( $separate_comments ) {
-                $wp_query->comments_by_type = separate_comments($comments);
+                $wp_query->comments_by_type = separate_comments( $comments );
                 $comments_by_type = &$wp_query->comments_by_type;
         }
 
         $overridden_cpage = false;
-        if ( '' == get_query_var('cpage') && get_option('page_comments') ) {
-                set_query_var( 'cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1 );
+        if ( '' == get_query_var( 'cpage' ) && get_option( 'page_comments' ) ) {
+                set_query_var( 'cpage', 'newest' == get_option( 'default_comments_page' ) ? get_comment_pages_count() : 1 );
                 $overridden_cpage = true;
         }
 
-        if ( !defined('COMMENTS_TEMPLATE') )
-                define('COMMENTS_TEMPLATE', true);
+        if ( !defined( 'COMMENTS_TEMPLATE' ) )
+                define( 'COMMENTS_TEMPLATE', true );
 
         $theme_template = STYLESHEETPATH . $file;
         /**
@@ -1122 +1122 @@
 function comments_popup_script( $width = 400, $height = 400, $file = '' ) {
         global $wpcommentspopupfile, $wpcommentsjavascript;
 
-        if (empty ($file)) {
+        if ( empty ( $file ) ) {
                 $wpcommentspopupfile = '';  // Use the index.
         } else {
                 $wpcommentspopupfile = $file;
@@ -1164 +1164 @@
         $number = get_comments_number( $id );
 
         if ( 0 == $number && !comments_open() && !pings_open() ) {
-                echo '<span' . ((!empty($css_class)) ? ' class="' . esc_attr( $css_class ) . '"' : '') . '>' . $none . '</span>';
+                echo '<span' . ( ( !empty( $css_class ) ) ? ' class="' . esc_attr( $css_class ) . '"' : '' ) . '>' . $none . '</span>';
                 return;
         }
 
         if ( post_password_required() ) {
-                echo __('Enter your password to view comments.');
+                echo __( 'Enter your password to view comments.' );
                 return;
         }
 
@@ -1178 +1178 @@
                 if ( empty( $wpcommentspopupfile ) )
                         $home = home_url();
                 else
-                        $home = get_option('siteurl');
+                        $home = get_option( 'siteurl' );
                 echo $home . '/' . $wpcommentspopupfile . '?comments_popup=' . $id;
                 echo '" onclick="wpopen(this.href); return false"';
         } else { // if comments_popup_script() is not in the template, display simple comment link
@@ -1192 +1192 @@
         if ( !empty( $css_class ) ) {
                 echo ' class="'.$css_class.'" ';
         }
-        $title = the_title_attribute( array('echo' => 0 ) );
+        $title = the_title_attribute( array( 'echo' => 0 ) );
 
         $attributes = '';
         /**
@@ -1204 +1204 @@
          */
         echo apply_filters( 'comments_popup_link_attributes', $attributes );
 
-        echo ' title="' . esc_attr( sprintf( __('Comment on %s'), $title ) ) . '">';
+        echo ' title="' . esc_attr( sprintf( __( 'Comment on %s' ), $title ) ) . '">';
         comments_number( $zero, $one, $more );
         echo '</a>';
 }
@@ -1234 +1234 @@
  * @param int|WP_Post $post    Optional. Post ID or WP_Post object the comment is going to be displayed on. Default current post.
  * @return mixed Link to show comment form, if successful. False, if comments are closed.
  */
-function get_comment_reply_link($args = array(), $comment = null, $post = null) {
+function get_comment_reply_link( $args = array(), $comment = null, $post = null ) {
 
         $defaults = array(
                 'add_below'  => 'comment',
                 'respond_id' => 'respond',
-                'reply_text' => __('Reply'),
-                'login_text' => __('Log in to Reply'),
+                'reply_text' => __( 'Reply' ),
+                'login_text' => __( 'Log in to Reply' ),
                 'depth'      => 0,
                 'before'     => '',
                 'after'      => ''
         );
 
-        $args = wp_parse_args($args, $defaults);
+        $args = wp_parse_args( $args, $defaults );
 
         if ( 0 == $args['depth'] || $args['max_depth'] <= $args['depth'] )
                 return;
 
-        extract($args, EXTR_SKIP);
+        extract( $args, EXTR_SKIP );
 
-        $comment = get_comment($comment);
-        if ( empty($post) )
+        $comment = get_comment( $comment );
+        if ( empty( $post ) )
                 $post = $comment->comment_post_ID;
-        $post = get_post($post);
+        $post = get_post( $post );
 
-        if ( !comments_open($post->ID) )
+        if ( !comments_open( $post->ID ) )
                 return false;
 
         $link = '';
 
-        if ( get_option('comment_registration') && ! is_user_logged_in() )
+        if ( get_option( 'comment_registration' ) && ! is_user_logged_in() )
                 $link = '<a rel="nofollow" class="comment-reply-login" href="' . esc_url( wp_login_url( get_permalink() ) ) . '">' . $login_text . '</a>';
         else
                 $link = "<a class='comment-reply-link' href='" . esc_url( add_query_arg( 'replytocom', $comment->comment_ID ) ) . "#" . $respond_id . "' onclick='return addComment.moveForm(\"$add_below-$comment->comment_ID\", \"$comment->comment_ID\", \"$respond_id\", \"$post->ID\")'>$reply_text</a>";
@@ -1293 +1293 @@
  * @param int|WP_Post $post    Optional. Post ID or WP_Post object the comment is going to be displayed on. Default current post.
  * @return mixed Link to show comment form, if successful. False, if comments are closed.
  */
-function comment_reply_link($args = array(), $comment = null, $post = null) {
-        echo get_comment_reply_link($args, $comment, $post);
+function comment_reply_link( $args = array(), $comment = null, $post = null ) {
+        echo get_comment_reply_link( $args, $comment, $post );
 }
 
 /**
@@ -1318 +1318 @@
  * @param int|WP_Post $post    Optional. Post ID or WP_Post object the comment is going to be displayed on. Default current post.
  * @return string|bool|null Link to show comment form, if successful. False, if comments are closed.
  */
-function get_post_reply_link($args = array(), $post = null) {
+function get_post_reply_link( $args = array(), $post = null ) {
         $defaults = array(
                 'add_below'  => 'post',
                 'respond_id' => 'respond',
-                'reply_text' => __('Leave a Comment'),
-                'login_text' => __('Log in to leave a Comment'),
+                'reply_text' => __( 'Leave a Comment' ),
+                'login_text' => __( 'Log in to leave a Comment' ),
                 'before'     => '',
                 'after'      => '',
         );
 
-        $args = wp_parse_args($args, $defaults);
-        extract($args, EXTR_SKIP);
-        $post = get_post($post);
+        $args = wp_parse_args( $args, $defaults );
+        extract( $args, EXTR_SKIP );
+        $post = get_post( $post );
 
-        if ( !comments_open($post->ID) )
+        if ( !comments_open( $post->ID ) )
                 return false;
 
-        if ( get_option('comment_registration') && ! is_user_logged_in() )
+        if ( get_option( 'comment_registration' ) && ! is_user_logged_in() )
                 $link = '<a rel="nofollow" href="' . wp_login_url( get_permalink() ) . '">' . $login_text . '</a>';
         else
-                $link = "<a rel='nofollow' class='comment-reply-link' href='" . get_permalink($post->ID) . "#$respond_id' onclick='return addComment.moveForm(\"$add_below-$post->ID\", \"0\", \"$respond_id\", \"$post->ID\")'>$reply_text</a>";
+                $link = "<a rel='nofollow' class='comment-reply-link' href='" . get_permalink( $post->ID ) . "#$respond_id' onclick='return addComment.moveForm(\"$add_below-$post->ID\", \"0\", \"$respond_id\", \"$post->ID\")'>$reply_text</a>";
 
         $formatted_link = $before . $link . $after;
         /**
@@ -1361 +1361 @@
  * @param int|WP_Post $post Optional. Post ID or WP_Post object the comment is going to be displayed on. Default current post.
  * @return string|bool|null Link to show comment form, if successful. False, if comments are closed.
  */
-function post_reply_link($args = array(), $post = null) {
-        echo get_post_reply_link($args, $post);
+function post_reply_link( $args = array(), $post = null ) {
+        echo get_post_reply_link( $args, $post );
 }
 
 /**
@@ -1373 +1373 @@
  * @param string $text Optional. Text to display for cancel reply link. Default empty.
  */
 function get_cancel_comment_reply_link( $text = '' ) {
-        if ( empty($text) )
-                $text = __('Click here to cancel reply.');
+        if ( empty( $text ) )
+                $text = __( 'Click here to cancel reply.' );
 
-        $style = isset($_GET['replytocom']) ? '' : ' style="display:none;"';
-        $link = esc_html( remove_query_arg('replytocom') ) . '#respond';
+        $style = isset( $_GET['replytocom'] ) ? '' : ' style="display:none;"';
+        $link = esc_html( remove_query_arg( 'replytocom' ) ) . '#respond';
 
         $formatted_link = '<a rel="nofollow" id="cancel-comment-reply-link" href="' . $link . '"' . $style . '>' . $text . '</a>';
         /**
@@ -1400 +1400 @@
  * @param string $text Optional. Text to display for cancel reply link. Default empty.
  */
 function cancel_comment_reply_link( $text = '' ) {
-        echo get_cancel_comment_reply_link($text);
+        echo get_cancel_comment_reply_link( $text );
 }
 
 /**
@@ -1415 +1415 @@
         if ( empty( $id ) )
                 $id = get_the_ID();
 
-        $replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
+        $replytoid = isset( $_GET['replytocom'] ) ? (int) $_GET['replytocom'] : 0;
         $result  = "<input type='hidden' name='comment_post_ID' value='$id' id='comment_post_ID' />\n";
         $result .= "<input type='hidden' name='comment_parent' id='comment_parent' value='$replytoid' />\n";
 
@@ -1460 +1460 @@
         if ( false === $noreplytext ) $noreplytext = __( 'Leave a Reply' );
         if ( false === $replytext ) $replytext = __( 'Leave a Reply to %s' );
 
-        $replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
+        $replytoid = isset( $_GET['replytocom'] ) ? (int) $_GET['replytocom'] : 0;
 
         if ( 0 == $replytoid )
                 echo $noreplytext;
         else {
-                $comment = get_comment($replytoid);
+                $comment = get_comment( $replytoid );
                 $author = ( $linktoparent ) ? '<a href="#comment-' . get_comment_ID() . '">' . get_comment_author() . '</a>' : get_comment_author();
                 printf( $replytext, $author );
         }
@@ -1497 +1497 @@
          * @since 2.7.0
          * @var array
          */
-        var $db_fields = array ('parent' => 'comment_parent', 'id' => 'comment_ID');
+        var $db_fields = array ( 'parent' => 'comment_parent', 'id' => 'comment_ID' );
 
         /**
          * Start the list before the elements are added.
@@ -1596 +1596 @@
 
                 // If we're at the max depth, and the current element still has children, loop over those and display them at this level
                 // This is to prevent them being orphaned to the end of the list.
-                if ( $max_depth <= $depth + 1 && isset( $children_elements[$id]) ) {
+                if ( $max_depth <= $depth + 1 && isset( $children_elements[$id] ) ) {
                         foreach ( $children_elements[ $id ] as $child )
                                 $this->display_element( $child, $children_elements, $max_depth, $depth, $args, $output );
 
@@ -1845 +1845 @@
         // Figure out what comments we'll be looping through ($_comments)
         if ( null !== $comments ) {
                 $comments = (array) $comments;
-                if ( empty($comments) )
+                if ( empty( $comments ) )
                         return;
                 if ( 'all' != $r['type'] ) {
-                        $comments_by_type = separate_comments($comments);
-                        if ( empty($comments_by_type[$r['type']]) )
+                        $comments_by_type = separate_comments( $comments );
+                        if ( empty( $comments_by_type[$r['type']] ) )
                                 return;
                         $_comments = $comments_by_type[$r['type']];
                 } else {
                         $_comments = $comments;
                 }
         } else {
-                if ( empty($wp_query->comments) )
+                if ( empty( $wp_query->comments ) )
                         return;
                 if ( 'all' != $r['type'] ) {
-                        if ( empty($wp_query->comments_by_type) )
-                                $wp_query->comments_by_type = separate_comments($wp_query->comments);
-                        if ( empty($wp_query->comments_by_type[$r['type']]) )
+                        if ( empty( $wp_query->comments_by_type ) )
+                                $wp_query->comments_by_type = separate_comments( $wp_query->comments );
+                        if ( empty( $wp_query->comments_by_type[$r['type']] ) )
                                 return;
                         $_comments = $wp_query->comments_by_type[$r['type']];
                 } else {
@@ -1869 +1869 @@
                 }
         }
 
-        if ( '' === $r['per_page'] && get_option('page_comments') )
-                $r['per_page'] = get_query_var('comments_per_page');
+        if ( '' === $r['per_page'] && get_option( 'page_comments' ) )
+                $r['per_page'] = get_query_var( 'comments_per_page' );
 
-        if ( empty($r['per_page']) ) {
+        if ( empty( $r['per_page'] ) ) {
                 $r['per_page'] = 0;
                 $r['page'] = 0;
         }
 
         if ( '' === $r['max_depth'] ) {
-                if ( get_option('thread_comments') )
-                        $r['max_depth'] = get_option('thread_comments_depth');
+                if ( get_option( 'thread_comments' ) )
+                        $r['max_depth'] = get_option( 'thread_comments_depth' );
                 else
                         $r['max_depth'] = -1;
         }
 
         if ( '' === $r['page'] ) {
-                if ( empty($overridden_cpage) ) {
-                        $r['page'] = get_query_var('cpage');
+                if ( empty( $overridden_cpage ) ) {
+                        $r['page'] = get_query_var( 'cpage' );
                 } else {
                         $threaded = ( -1 != $r['max_depth'] );
-                        $r['page'] = ( 'newest' == get_option('default_comments_page') ) ? get_comment_pages_count($_comments, $r['per_page'], $threaded) : 1;
+                        $r['page'] = ( 'newest' == get_option( 'default_comments_page' ) ) ? get_comment_pages_count( $_comments, $r['per_page'], $threaded ) : 1;
                         set_query_var( 'cpage', $r['page'] );
                 }
         }
         // Validation check
-        $r['page'] = intval($r['page']);
+        $r['page'] = intval( $r['page'] );
         if ( 0 == $r['page'] && 0 != $r['per_page'] )
                 $r['page'] = 1;
 
         if ( null === $r['reverse_top_level'] )
-                $r['reverse_top_level'] = ( 'desc' == get_option('comment_order') );
+                $r['reverse_top_level'] = ( 'desc' == get_option( 'comment_order' ) );
 
         extract( $r, EXTR_SKIP );
 
-        if ( empty($walker) )
+        if ( empty( $walker ) )
                 $walker = new Walker_Comment;
 
-        $output = $walker->paged_walk($_comments, $max_depth, $page, $per_page, $r);
+        $output = $walker->paged_walk( $_comments, $max_depth, $page, $per_page, $r );
         $wp_query->max_num_comment_pages = $walker->max_pages;
 
         $in_comment_loop = false;
@@ -1983 +1983 @@
                             '<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" /></p>',
         );
 
-        $required_text = sprintf( ' ' . __('Required fields are marked %s'), '<span class="required">*</span>' );
+        $required_text = sprintf( ' ' . __( 'Required fields are marked %s' ), '<span class="required">*</span>' );
 
         /**
          * Filter the default comment form fields.