Changeset 41612 for trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php

Timestamp:

09/27/2017 11:59:01 AM (7 years ago)

Author:

swissspidy

Message:

Upgrade/Install: Fix updating plugins on the Add Plugins screen.

Props imath.
Fixes #41407.

File:

• trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php (modified) (5 diffs)

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

@@ -33 +33 @@
 
     /**
+     * Return the list of known plugins.
+     *
+     * Uses the transient data from the updates API to determine the known
+     * installed plugins.
+     *
+     * @since 4.9.0
+     * @access protected
+     *
+     * @return array
+     */
+    protected function get_installed_plugins() {
+        $plugins = array();
+
+        $plugin_info = get_site_transient( 'update_plugins' );
+        if ( isset( $plugin_info->no_update ) ) {
+            foreach ( $plugin_info->no_update as $plugin ) {
+                $plugin->upgrade          = false;
+                $plugins[ $plugin->slug ] = $plugin;
+            }
+        }
+
+        if ( isset( $plugin_info->response ) ) {
+            foreach ( $plugin_info->response as $plugin ) {
+                $plugin->upgrade          = true;
+                $plugins[ $plugin->slug ] = $plugin;
+            }
+        }
+
+        return $plugins;
+    }
+
+    /**
      * Return a list of slugs of installed plugins, if known.
      *
@@ -44 +76 @@
      */
     protected function get_installed_plugin_slugs() {
-        $slugs = array();
-
-        $plugin_info = get_site_transient( 'update_plugins' );
-        if ( isset( $plugin_info->no_update ) ) {
-            foreach ( $plugin_info->no_update as $plugin ) {
-                $slugs[] = $plugin->slug;
-            }
-        }
-
-        if ( isset( $plugin_info->response ) ) {
-            foreach ( $plugin_info->response as $plugin ) {
-                $slugs[] = $plugin->slug;
-            }
-        }
-
-        return $slugs;
+        return array_keys( $this->get_installed_plugins() );
     }
 
@@ -124 +141 @@
         if ( empty( $tab ) || ( !isset( $tabs[ $tab ] ) && !in_array( $tab, (array) $nonmenu_tabs ) ) )
             $tab = key( $tabs );
+
+        $installed_plugins = $this->get_installed_plugins();
 
         $args = array(
@@ -135 +154 @@
             // Send the locale and installed plugin slugs to the API so it can provide context-sensitive results.
             'locale' => get_user_locale(),
-            'installed_plugins' => $this->get_installed_plugin_slugs(),
+            'installed_plugins' => array_keys( $installed_plugins ),
         );
 
@@ -224 +243 @@
         if ( isset( $api->info['groups'] ) ) {
             $this->groups = $api->info['groups'];
+        }
+
+        if ( $installed_plugins ) {
+            $js_plugins = array_fill_keys(
+                array( 'all', 'search', 'active', 'inactive', 'recently_activated', 'mustuse', 'dropins' ),
+                array()
+            );
+
+            $js_plugins['all'] = array_values( wp_list_pluck( $installed_plugins, 'plugin' ) );
+            $upgrade_plugins   = wp_filter_object_list( $installed_plugins, array( 'upgrade' => true ), 'and', 'plugin' );
+
+            if ( $upgrade_plugins ) {
+                $js_plugins['upgrade'] = array_values( $upgrade_plugins );
+            }
+
+            wp_localize_script( 'updates', '_wpUpdatesItemCounts', array(
+                'plugins' => $js_plugins,
+                'totals'  => wp_get_update_data(),
+            ) );
         }
     }