Changeset 20236 for trunk/wp-admin/includes/class-wp-ms-themes-list-table.php

Timestamp:

03/21/2012 04:19:27 PM (14 years ago)

Author:

nacin

Message:

Visually merge a plugin with its update notice. Same applies to themes in the network admin. Move from 'update automatically' to 'update now'. fixes #20273.

File:

• trunk/wp-admin/includes/class-wp-ms-themes-list-table.php (modified) (4 diffs)

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

@@ -72 +72 @@
                 }
 
-                $maybe_update = current_user_can( 'update_themes' ) && ! $this->is_site_themes && get_site_transient( 'update_themes' );
+                $maybe_update = current_user_can( 'update_themes' ) && ! $this->is_site_themes && $current = get_site_transient( 'update_themes' );
 
                 foreach ( (array) $themes['all'] as $key => $theme ) {
@@ -80 +80 @@
                         }
 
+                        if ( $maybe_update && isset( $current->response[ $key ] ) ) {
+                                $themes['all'][ $key ]->update = true;
+                                $themes['upgrade'][ $key ] = $themes['all'][ $key ];
+                        }
+
                         $filter = $theme->is_allowed( $allowed_where, $this->site_id ) ? 'enabled' : 'disabled';
                         $themes[ $filter ][ $key ] = $themes['all'][ $key ];
-
-                        if ( $maybe_update && isset( $current->response[ $key ] ) )
-                                $themes['upgrade'][ $key ] = $themes['all'][ $key ];
                 }
 
@@ -262 +264 @@
 
         function single_row( $key, $theme ) {
-                global $status, $page, $s;
+                global $status, $page, $s, $totals;
 
                 $context = $status;
@@ -305 +307 @@
 
                 $id = sanitize_html_class( $theme->get_stylesheet() );
+
+                if ( ! empty( $totals['upgrade'] ) && ! empty( $theme->update ) )
+                        $class .= ' update';
 
                 echo "<tr id='$id' class='$class'>";