Changeset 29226

Timestamp:

07/18/2014 08:48:28 PM (11 years ago)

Author:

nacin

Message:

Add 'Details' links to installed plugins.

Installed plugins that are up to date are now returned in the update-check API response.

props tellyworth.
see #17902.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-plugins-list-table.php (modified) (3 diffs)
• wp-includes/update.php (modified) (2 diffs)

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

@@ -109 +109 @@
             update_option( 'recently_activated', $recently_activated );
         }
+        
+        $plugin_info = get_site_transient( 'update_plugins' );
 
         foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
+            // 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 );
+            } 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 );
+            }
+
             // Filter into individual sections
             if ( is_multisite() && ! $screen->in_admin( 'network' ) && is_network_only_plugin( $plugin_file ) && ! is_plugin_active( $plugin_file ) ) {
@@ -345 +354 @@
             'deactivate' => '',
             'activate' => '',
+            'details' => '',
             'edit' => '',
             'delete' => '',
@@ -393 +403 @@
                         $actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins') . '" title="' . esc_attr__('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
                 } // end if $is_active
+                
              } // end if $screen->in_admin( 'network' )
+
+            // Details link using API info, if available
+            if ( ( ! is_multisite() || $screen->in_admin( 'network' ) ) && isset( $plugin_data['slug'] ) ) {
+                $actions['details'] = sprintf( '<a href="%s" class="thickbox" title="%s">%s</a>',
+                    esc_url( self_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_data['slug'] .
+                        '&TB_iframe=true&width=600&height=550' ) ),
+                    esc_attr( sprintf( __( 'More information about %s' ), $plugin_data['Name'] ) ),
+                    __( 'Details' ) );
+            }
 
             if ( ( ! is_multisite() || $screen->in_admin( 'network' ) ) && current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) )

trunk/src/wp-includes/update.php

@@ -278 +278 @@
             'translations' => json_encode( $translations ),
             'locale'       => json_encode( $locales ),
+            'all'          => json_encode( true ),
         ),
         'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
@@ -304 +305 @@
     }
     unset( $plugin );
+    foreach ( $response['no_update'] as &$plugin ) {
+        $plugin = (object) $plugin;
+    }
+    unset( $plugin );
 
     if ( is_array( $response ) ) {
         $new_option->response = $response['plugins'];
         $new_option->translations = $response['translations'];
+        // TODO: Perhaps better to store no_update in a separate transient with an expiry?
+        $new_option->no_update = $response['no_update'];
     } else {
         $new_option->response = array();
         $new_option->translations = array();
+        $new_option->no_update = array();
     }