WordPress 4.2

[autoinstalls/wordpress.git] / wp-admin / includes / class-wp-plugins-list-table.php

diff --git a/wp-admin/includes/class-wp-plugins-list-table.php b/wp-admin/includes/class-wp-plugins-list-table.php
index 1ade73caacddce075e8c6ce560fc273fbc9ebe11..8ee85ba03664afd9aaf9cf945ca4765a7a2a0ee5 100644 (file)
--- a/wp-admin/includes/class-wp-plugins-list-table.php
+++ b/wp-admin/includes/class-wp-plugins-list-table.php
@@ -125,8 +125,17 @@ class WP_Plugins_List_Table extends WP_List_Table {
                        // Extra info if known. array_merge() ensures $plugin_data has precedence if keys collide.
                        if ( isset( $plugin_info->response[ $plugin_file ] ) ) {
                                $plugins['all'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->response[ $plugin_file ], $plugin_data );
+                               // Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade
+                               if ( isset( $plugins['upgrade'][ $plugin_file ] ) ) {
+                                       $plugins['upgrade'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->response[ $plugin_file ], $plugin_data );
+                               }
+
                        } elseif ( isset( $plugin_info->no_update[ $plugin_file ] ) ) {
                                $plugins['all'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->no_update[ $plugin_file ], $plugin_data );
+                               // Make sure that $plugins['upgrade'] also receives the extra info since it is used on ?plugin_status=upgrade
+                               if ( isset( $plugins['upgrade'][ $plugin_file ] ) ) {
+                                       $plugins['upgrade'][ $plugin_file ] = $plugin_data = array_merge( (array) $plugin_info->no_update[ $plugin_file ], $plugin_data );
+                               }
                        }
 
                        // Filter into individual sections
@@ -515,7 +524,12 @@ class WP_Plugins_List_Table extends WP_List_Table {
                if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) )
                        $class .= ' update';
 
-               echo "<tr id='$id' class='$class'>";
+               $plugin_slug = ( isset( $plugin_data['slug'] ) ) ? $plugin_data['slug'] : '';
+               printf( "<tr id='%s' class='%s' data-slug='%s'>",
+                       $id,
+                       $class,
+                       $plugin_slug
+               );
 
                list( $columns, $hidden ) = $this->get_column_info();