Changeset 32723

Timestamp:

06/10/2015 07:30:22 PM (10 years ago)

Author:

helen

Message:

List tables:

Since the primary column is not going to be alterable for plugins and MS themes, we don't need to check in on it.

see #25408.

Location:

trunk/src/wp-admin/includes

Files:

• class-wp-ms-themes-list-table.php (modified) (4 diffs)
• class-wp-plugins-list-table.php (modified) (5 diffs)

trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php

@@ -439 +439 @@
                 $style = ' style="display:none;"';
 
-            $extra_class = '';
-            if ( $primary === $column_name ) {
-                $extra_class = ' column-primary';
-            }
-
             switch ( $column_name ) {
                 case 'cb':
@@ -449 +444 @@
                     break;
                 case 'name':
-                    echo "<td class='theme-title{$extra_class}'$style><strong>" . $theme->display('Name') . "</strong>";
-                    if ( $primary === $column_name ) {
-                        echo $this->row_actions($actions, true);
-                    }
+                    echo "<td class='theme-title column-primary'$style><strong>" . $theme->display('Name') . "</strong>";
+                    echo $this->row_actions($actions, true);
                     echo "</td>";
                     break;
                 case 'description':
-                    echo "<td class='column-description desc{$extra_class}'$style>";
+                    echo "<td class='column-description desc'$style>";
                     if ( $theme->errors() ) {
                         $pre = $status == 'broken' ? __( 'Broken Theme:' ) . ' ' : '';
@@ -491 +484 @@
 
                     echo '</div>';
-                    if ( $primary === $column_name ) {
-                        echo $this->row_actions($actions, true);
-                    }
                     echo '</td>';
                     break;
 
                 default:
-                    echo "<td class='$column_name column-$column_name{$extra_class}'$style>";
+                    echo "<td class='$column_name column-$column_name'$style>";
 
                     /**
@@ -511 +501 @@
                     do_action( 'manage_themes_custom_column', $column_name, $stylesheet, $theme );
 
-                    if ( $primary === $column_name ) {
-                        echo $this->row_actions($actions, true);
-                    }
                     echo "</td>";
             }

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

@@ -582 +582 @@
         list( $columns, $hidden, $sortable, $primary ) = $this->get_column_info();
 
-        $extra_class = ' column-primary';
-
         foreach ( $columns as $column_name => $column_display_name ) {
             $style = '';
@@ -595 +593 @@
                     break;
                 case 'name':
-                    if ( $primary === $column_name || ! isset( $columns[ $primary ] ) ) {
-                        echo "<td class='plugin-title $extra_class'$style><strong>$plugin_name</strong>";
-                        echo $this->row_actions( $actions, true );
-                    } else {
-                        echo "<td class='plugin-title'$style><strong>$plugin_name</strong>";
-                    }
+                    echo "<td class='plugin-title column-primary'$style><strong>$plugin_name</strong>";
+                    echo $this->row_actions( $actions, true );
                     echo "</td>";
                     break;
                 case 'description':
                     $classes = 'column-description desc';
-                    if ( $primary === $column_name ) {
-                        $classes .= " $extra_class";
-                    }
 
                     echo "<td class='$classes'$style>
@@ -656 +647 @@
                     echo implode( ' | ', $plugin_meta );
 
-                    if ( $primary === $column_name ) {
-                        echo $this->row_actions( $actions, true );
-                    }
                     echo "</div></td>";
                     break;
                 default:
                     $classes = "$column_name column-$column_name$class";
-                    if ( $primary === $column_name ) {
-                        $classes .= " $extra_class";
-                    }
 
                     echo "<td class='$classes'$style>";
@@ -680 +665 @@
                     do_action( 'manage_plugins_custom_column', $column_name, $plugin_file, $plugin_data );
 
-                    if ( $primary === $column_name ) {
-                        echo $this->row_actions( $actions, true );
-                    }
                     echo "</td>";
             }
@@ -725 +707 @@
      * @access protected
      *
-     * @return string Unalterable name for the primary column, in this case, 'plugin'.
+     * @return string Unalterable name for the primary column, in this case, 'name'.
      */
     protected function get_primary_column_name() {
-        return 'plugin';
+        return 'name';
     }
 }