Changeset 24123

Timestamp:

04/29/2013 01:10:50 AM (13 years ago)

Author:

SergeyBiryukov

Message:

Remove redundant echo calls from list tables. Don't mix string concatenation with direct output. see #24210.

Location:

trunk/wp-admin/includes

Files:

• ajax-actions.php (modified) (1 diff)
• class-wp-comments-list-table.php (modified) (1 diff)
• class-wp-list-table.php (modified) (1 diff)
• class-wp-posts-list-table.php (modified) (3 diffs)
• class-wp-terms-list-table.php (modified) (7 diffs)
• class-wp-upgrader.php (modified) (1 diff)
• class-wp-users-list-table.php (modified) (1 diff)
• theme-install.php (modified) (1 diff)

trunk/wp-admin/includes/ajax-actions.php

@@ -1416 +1416 @@
                 $level++;
         }
-        echo $wp_list_table->single_row( $tag, $level );
+        $wp_list_table->single_row( $tag, $level );
         wp_die();
 }

trunk/wp-admin/includes/class-wp-comments-list-table.php

@@ -316 +316 @@
 
                 echo "<tr id='comment-$comment->comment_ID' class='$the_comment_class'>";
-                echo $this->single_row_columns( $comment );
+                $this->single_row_columns( $comment );
                 echo "</tr>\n";
         }

trunk/wp-admin/includes/class-wp-list-table.php

@@ -827 +827 @@
 
                 echo '<tr' . $row_class . '>';
-                echo $this->single_row_columns( $item );
+                $this->single_row_columns( $item );
                 echo '</tr>';
         }

trunk/wp-admin/includes/class-wp-posts-list-table.php

@@ -383 +383 @@
                                 break;
 
-                        if ( $count >= $start )
-                                echo "\t" . $this->single_row( $page, $level );
+                        if ( $count >= $start ) {
+                                echo "\t";
+                                $this->single_row( $page, $level );
+                        }
 
                         $count++;
@@ -398 +400 @@
                                         if ( $count >= $end )
                                                 break;
-                                        if ( $count >= $start )
-                                                echo "\t" . $this->single_row( $op, 0 );
+
+                                        if ( $count >= $start ) {
+                                                echo "\t";
+                                                $this->single_row( $op, 0 );
+                                        }
+
                                         $count++;
                                 }
@@ -445 +451 @@
                                 $num_parents = count( $my_parents );
                                 while ( $my_parent = array_pop( $my_parents ) ) {
-                                        echo "\t" . $this->single_row( $my_parent, $level - $num_parents );
+                                        echo "\t";
+                                        $this->single_row( $my_parent, $level - $num_parents );
                                         $num_parents--;
                                 }
                         }
 
-                        if ( $count >= $start )
-                                echo "\t" . $this->single_row( $page, $level );
+                        if ( $count >= $start ) {
+                                echo "\t";
+                                $this->single_row( $page, $level );
+                        }
 
                         $count++;

trunk/wp-admin/includes/class-wp-terms-list-table.php

@@ -137 +137 @@
 
                 // convert it to table rows
-                $out = '';
                 $count = 0;
 
@@ -153 +152 @@
 
                         // Some funky recursion to get the job done( Paging & parents mainly ) is contained within, Skip it for non-hierarchical taxonomies for performance sake
-                        $out .= $this->_rows( $taxonomy, $terms, $children, $offset, $number, $count );
+                        $this->_rows( $taxonomy, $terms, $children, $offset, $number, $count );
                 } else {
                         $terms = get_terms( $taxonomy, $args );
                         foreach ( $terms as $term )
-                                $out .= $this->single_row( $term, 0, $taxonomy );
+                                $this->single_row( $term, 0, $taxonomy );
                         $count = $number; // Only displaying a single page.
                 }
@@ -166 +165 @@
                         $this->no_items();
                         echo '</td></tr>';
-                } else {
-                        echo $out;
                 }
         }
@@ -175 +172 @@
                 $end = $start + $per_page;
 
-                $output = '';
                 foreach ( $terms as $key => $term ) {
 
@@ -200 +196 @@
                                 $num_parents = count( $my_parents );
                                 while ( $my_parent = array_pop( $my_parents ) ) {
-                                        $output .=  "\t" . $this->single_row( $my_parent, $level - $num_parents, $taxonomy );
+                                        echo "\t";
+                                        $this->single_row( $my_parent, $level - $num_parents, $taxonomy );
                                         $num_parents--;
                                 }
                         }
 
-                        if ( $count >= $start )
-                                $output .= "\t" . $this->single_row( $term, $level, $taxonomy );
+                        if ( $count >= $start ) {
+                                echo "\t";
+                                $this->single_row( $term, $level, $taxonomy );
+                        }
 
                         ++$count;
@@ -213 +212 @@
 
                         if ( isset( $children[$term->term_id] ) && empty( $_REQUEST['s'] ) )
-                                $output .= $this->_rows( $taxonomy, $terms, $children, $start, $per_page, $count, $term->term_id, $level + 1 );
-                }
-
-                return $output;
+                                $this->_rows( $taxonomy, $terms, $children, $start, $per_page, $count, $term->term_id, $level + 1 );
+                }
         }
 
@@ -226 +223 @@
 
                 echo '<tr id="tag-' . $tag->term_id . '"' . $row_class . '>';
-                echo $this->single_row_columns( $tag );
+                $this->single_row_columns( $tag );
                 echo '</tr>';
         }

trunk/wp-admin/includes/class-wp-upgrader.php

@@ -1130 +1130 @@
                 $this->done_header = true;
                 echo '<div class="wrap">';
-                echo screen_icon();
+                screen_icon();
                 echo '<h2>' . $this->options['title'] . '</h2>';
         }

trunk/wp-admin/includes/class-wp-users-list-table.php

@@ -210 +210 @@
 
                         $style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"';
-                        echo "\n\t", $this->single_row( $user_object, $style, $role, isset( $post_counts ) ? $post_counts[ $userid ] : 0 );
+                        echo "\n\t" . $this->single_row( $user_object, $style, $role, isset( $post_counts ) ? $post_counts[ $userid ] : 0 );
                 }
         }

trunk/wp-admin/includes/theme-install.php

@@ -154 +154 @@
         _deprecated_function( __FUNCTION__, '3.4' );
         global $wp_list_table;
-        return $wp_list_table->single_row( $theme );
+        $wp_list_table->single_row( $theme );
 }