Changeset 15632

Timestamp:

09/18/2010 07:30:53 PM (14 years ago)

Author:

scribu

Message:

WP_Terms_Table cleanup:

• use column_*() methods
• remove $taxonomy argument from single_row()
• don't calculate tag full name in admin-ajax.php

See #14579

Location:

trunk/wp-admin

Files:

• admin-ajax.php (modified) (3 diffs)
• includes/default-list-tables.php (modified) (2 diffs)

trunk/wp-admin/admin-ajax.php

@@ -560 +560 @@
 
     $level = 0;
-    $tag_full_name = false;
-    $tag_full_name = $tag->name;
     if ( is_taxonomy_hierarchical($taxonomy) ) {
-        $_tag = $tag;
-        while ( $_tag->parent  ) {
-            $_tag = get_term( $_tag->parent, $taxonomy );
-            $tag_full_name = $_tag->name . ' — ' . $tag_full_name;
-            $level++;
-        }
-        $noparents = $wp_list_table->single_row( $tag, $level, $taxonomy );
-    }
-    $tag->name = $tag_full_name;
-    $parents = $wp_list_table->single_row( $tag, 0, $taxonomy);
+        $level = count( get_ancestors( $tag->term_id, $taxonomy ) );
+        ob_start();
+        $wp_list_table->single_row( $tag, $level );
+        $noparents = ob_get_clean();
+    }
+
+    ob_start();
+    $wp_list_table->single_row( $tag );
+    $parents = ob_get_clean();
 
     $x->add( array(
@@ -581 +578 @@
         'what' => 'term',
         'position' => $level,
-        'supplemental' => get_term( $tag->term_id, $taxonomy, ARRAY_A ) // Refetch as $tag has been contaminated by the full name.
+        'supplemental' => $tag
         ) );
     $x->send();
@@ -1228 +1225 @@
         }
 
-        echo $wp_list_table->single_row( $tag, 0, $taxonomy );
+        echo $wp_list_table->single_row( $tag );
     } else {
         if ( is_wp_error($updated) && $updated->get_error_message() )

trunk/wp-admin/includes/default-list-tables.php

@@ -1598 +1598 @@
     }
 
-    function single_row( $tag, $level, $taxonomy = 'post_tag' ) {
-        global $post_type, $current_screen;
+    function single_row( $tag, $level = 0 ) {
         static $row_class = '';
         $row_class = ( $row_class == '' ? ' class="alternate"' : '' );
 
+        $this->level = $level;
+
+        echo '<tr id="tag-' . $tag->term_id . '"' . $row_class . '>';
+        echo $this->single_row_columns( $tag );
+        echo '</tr>';
+    }
+
+    function column_cb( $tag ) {
+        global $taxonomy, $tax;
+
+        $default_term = get_option( 'default_' . $taxonomy );
+
+        if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term )
+            return '<input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" />';
+        else
+            return '&nbsp;';
+    }
+
+    function column_name( $tag ) {
+        global $taxonomy, $tax, $post_type;
+
+        $default_term = get_option( 'default_' . $taxonomy );
+
+        $pad = str_repeat( '&#8212; ', max( 0, $this->level ) );
+        $name = apply_filters( 'term_name', $pad . ' ' . $tag->name, $tag );
+        $qe_data = get_term( $tag->term_id, $taxonomy, OBJECT, 'edit' );
+        $edit_link = "edit-tags.php?action=edit&amp;taxonomy=$taxonomy&amp;post_type=$post_type&amp;tag_ID=$tag->term_id";
+
+        $out = '<strong><a class="row-title" href="' . $edit_link . '" title="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $name ) ) . '">' . $name . '</a></strong><br />';
+
+        $actions = array();
+        if ( current_user_can( $tax->cap->edit_terms ) ) {
+            $actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
+            $actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __( 'Quick&nbsp;Edit' ) . '</a>';
+        }
+        if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term )
+            $actions['delete'] = "<a class='delete-tag' href='" . wp_nonce_url( "edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ) . "'>" . __( 'Delete' ) . "</a>";
+
+        $actions = apply_filters( 'tag_row_actions', $actions, $tag );
+        $actions = apply_filters( "${taxonomy}_row_actions", $actions, $tag );
+
+        $out .= $this->row_actions( $actions );
+        $out .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">';
+        $out .= '<div class="name">' . $qe_data->name . '</div>';
+        $out .= '<div class="slug">' . apply_filters( 'editable_slug', $qe_data->slug ) . '</div>';
+        $out .= '<div class="parent">' . $qe_data->parent . '</div></div></td>';
+
+        return $out;
+    }
+    
+    function column_description( $tag ) {
+        return $tag->description;
+    }
+
+    function column_slug( $tag ) {
+        return apply_filters( 'editable_slug', $tag->slug );
+    }
+
+    function column_posts( $tag ) {
+        global $taxonomy, $post_type;
+
         $count = number_format_i18n( $tag->count );
-        $tax = get_taxonomy( $taxonomy );
 
         if ( 'post_tag' == $taxonomy ) {
@@ -1616 +1675 @@
         }
 
-        $pad = str_repeat( '&#8212; ', max( 0, $level ) );
-        $name = apply_filters( 'term_name', $pad . ' ' . $tag->name, $tag );
-        $qe_data = get_term( $tag->term_id, $taxonomy, object, 'edit' );
-        $edit_link = "edit-tags.php?action=edit&amp;taxonomy=$taxonomy&amp;post_type=$post_type&amp;tag_ID=$tag->term_id";
-
-        $out = '';
-        $out .= '<tr id="tag-' . $tag->term_id . '"' . $row_class . '>';
-
-        $default_term = get_option( 'default_' . $taxonomy );
-
-        list( $columns, $hidden ) = $this->get_column_headers();
-
-        foreach ( $columns as $column_name => $column_display_name ) {
-            $class = "class=\"$column_name column-$column_name\"";
-
-            $style = '';
-            if ( in_array( $column_name, $hidden ) )
-                $style = ' style="display:none;"';
-
-            $attributes = "$class$style";
-
-            switch ( $column_name ) {
-                case 'cb':
-                    if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term )
-                        $out .= '<th scope="row" class="check-column"> <input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" /></th>';
-                    else
-                        $out .= '<th scope="row" class="check-column">&nbsp;</th>';
-                    break;
-                case 'name':
-                    $out .= '<td ' . $attributes . '><strong><a class="row-title" href="' . $edit_link . '" title="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $name ) ) . '">' . $name . '</a></strong><br />';
-
-                    $actions = array();
-                    if ( current_user_can( $tax->cap->edit_terms ) ) {
-                        $actions['edit'] = '<a href="' . $edit_link . '">' . __( 'Edit' ) . '</a>';
-                        $actions['inline hide-if-no-js'] = '<a href="#" class="editinline">' . __( 'Quick&nbsp;Edit' ) . '</a>';
-                    }
-                    if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term )
-                        $actions['delete'] = "<a class='delete-tag' href='" . wp_nonce_url( "edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ) . "'>" . __( 'Delete' ) . "</a>";
-
-                    $actions = apply_filters( 'tag_row_actions', $actions, $tag );
-                    $actions = apply_filters( "${taxonomy}_row_actions", $actions, $tag );
-
-                    $out .= $this->row_actions( $actions );
-                    $out .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">';
-                    $out .= '<div class="name">' . $qe_data->name . '</div>';
-                    $out .= '<div class="slug">' . apply_filters( 'editable_slug', $qe_data->slug ) . '</div>';
-                    $out .= '<div class="parent">' . $qe_data->parent . '</div></div></td>';
-                    break;
-                case 'description':
-                    $out .= "<td $attributes>$tag->description</td>";
-                    break;
-                case 'slug':
-                    $out .= "<td $attributes>" . apply_filters( 'editable_slug', $tag->slug ) . "</td>";
-                    break;
-                case 'posts':
-                    $attributes = 'class="posts column-posts num"' . $style;
-                    $out .= "<td $attributes><a href='edit.php?$tagsel=$tag->slug&amp;post_type=$post_type'>$count</a></td>";
-                    break;
-                case 'links':
-                    $attributes = 'class="links column-links num"' . $style;
-                    $out .= "<td $attributes>$count</td>";
-                    break;
-                default:
-                    $out .= "<td $attributes>";
-                    $out .= apply_filters( "manage_${taxonomy}_custom_column", '', $column_name, $tag->term_id );
-                    $out .= "</td>";
-            }
-        }
-
-        $out .= "</tr>\n";
-
-        return $out;
+        return "<a href='edit.php?$tagsel=$tag->slug&amp;post_type=$post_type'>$count</a>";
+    }
+
+    function column_links( $tag ) {
+        $count = number_format_i18n( $tag->count );
+        return $count;
+    }
+
+    function column_default( $tag, $column_name ) {
+        global $taxonomy;
+    
+        return apply_filters( "manage_${taxonomy}_custom_column", '', $column_name, $tag->term_id );
+        $out .= "</td>";
     }