<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[29226] trunk/src: Add 'Details' links to installed plugins.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29226">29226</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-07-18 20:48:28 +0000 (Fri, 18 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://core.trac.wordpress.org/ticket/17902">#17902</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswppluginslisttablephp">trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunksrcwpincludesupdatephp">trunk/src/wp-includes/update.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswppluginslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-plugins-list-table.php (29225 => 29226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2014-07-18 19:34:47 UTC (rev 29225)
+++ trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2014-07-18 20:48:28 UTC (rev 29226)
</span><span class="lines">@@ -108,8 +108,17 @@
</span><span class="cx"> unset( $recently_activated[$key] );
</span><span class="cx"> update_option( 'recently_activated', $recently_activated );
</span><span class="cx"> }
</span><ins>+
+ $plugin_info = get_site_transient( 'update_plugins' );
</ins><span class="cx">
</span><span class="cx"> foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
</span><ins>+ // 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 );
+ }
+
</ins><span class="cx"> // Filter into individual sections
</span><span class="cx"> if ( is_multisite() && ! $screen->in_admin( 'network' ) && is_network_only_plugin( $plugin_file ) && ! is_plugin_active( $plugin_file ) ) {
</span><span class="cx"> // On the non-network screen, filter out network-only plugins as long as they're not individually activated
</span><span class="lines">@@ -344,6 +353,7 @@
</span><span class="cx"> $actions = array(
</span><span class="cx"> 'deactivate' => '',
</span><span class="cx"> 'activate' => '',
</span><ins>+ 'details' => '',
</ins><span class="cx"> 'edit' => '',
</span><span class="cx"> 'delete' => '',
</span><span class="cx"> );
</span><span class="lines">@@ -392,8 +402,18 @@
</span><span class="cx"> if ( ! is_multisite() && current_user_can('delete_plugins') )
</span><span class="cx"> $actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&checked[]=' . $plugin_file . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'bulk-plugins') . '" title="' . esc_attr__('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
</span><span class="cx"> } // end if $is_active
</span><ins>+
</ins><span class="cx"> } // end if $screen->in_admin( 'network' )
</span><span class="cx">
</span><ins>+ // 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' ) );
+ }
+
</ins><span class="cx"> if ( ( ! is_multisite() || $screen->in_admin( 'network' ) ) && current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) )
</span><span class="cx"> $actions['edit'] = '<a href="plugin-editor.php?file=' . $plugin_file . '" title="' . esc_attr__('Open this file in the Plugin Editor') . '" class="edit">' . __('Edit') . '</a>';
</span><span class="cx"> } // end if $context
</span></span></pre></div>
<a id="trunksrcwpincludesupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/update.php (29225 => 29226)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/update.php 2014-07-18 19:34:47 UTC (rev 29225)
+++ trunk/src/wp-includes/update.php 2014-07-18 20:48:28 UTC (rev 29226)
</span><span class="lines">@@ -277,6 +277,7 @@
</span><span class="cx"> 'plugins' => json_encode( $to_send ),
</span><span class="cx"> 'translations' => json_encode( $translations ),
</span><span class="cx"> 'locale' => json_encode( $locales ),
</span><ins>+ 'all' => json_encode( true ),
</ins><span class="cx"> ),
</span><span class="cx"> 'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
</span><span class="cx"> );
</span><span class="lines">@@ -303,13 +304,20 @@
</span><span class="cx"> $plugin = (object) $plugin;
</span><span class="cx"> }
</span><span class="cx"> unset( $plugin );
</span><ins>+ foreach ( $response['no_update'] as &$plugin ) {
+ $plugin = (object) $plugin;
+ }
+ unset( $plugin );
</ins><span class="cx">
</span><span class="cx"> if ( is_array( $response ) ) {
</span><span class="cx"> $new_option->response = $response['plugins'];
</span><span class="cx"> $new_option->translations = $response['translations'];
</span><ins>+ // TODO: Perhaps better to store no_update in a separate transient with an expiry?
+ $new_option->no_update = $response['no_update'];
</ins><span class="cx"> } else {
</span><span class="cx"> $new_option->response = array();
</span><span class="cx"> $new_option->translations = array();
</span><ins>+ $new_option->no_update = array();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> set_site_transient( 'update_plugins', $new_option );
</span></span></pre>
</div>
</div>
</body>
</html>