<!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>[20751] trunk/wp-admin/includes: When showing already installed themes in the theme installer list, indicate in the row actions that the theme is installed and offer an update link if updates are available.</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, #logmsg > ol { margin-left: 0; 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/20751">20751</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2012-05-09 15:01:49 +0000 (Wed, 09 May 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>When showing already installed themes in the theme installer list, indicate in the row actions that the theme is installed and offer an update link if updates are available.
Props SergeyBiryukov
Fixes <a href="http://core.trac.wordpress.org/ticket/20618">#20618</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpplugininstalllisttablephp">trunk/wp-admin/includes/class-wp-plugin-install-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpthemeinstalllisttablephp">trunk/wp-admin/includes/class-wp-theme-install-list-table.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpplugininstalllisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-plugin-install-list-table.php (20750 => 20751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-plugin-install-list-table.php 2012-05-09 03:58:27 UTC (rev 20750)
+++ trunk/wp-admin/includes/class-wp-plugin-install-list-table.php 2012-05-09 15:01:49 UTC (rev 20751)
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case 'latest_installed':
</span><span class="cx"> case 'newer_installed':
</span><del>- $action_links[] = '<span title="' . esc_attr__( 'This plugin is already installed and is up to date' ) . ' ">' . __( 'Installed' ) . '</span>';
</del><ins>+ $action_links[] = '<span title="' . esc_attr__( 'This plugin is already installed and is up to date' ) . ' ">' . _x( 'Installed', 'plugin' ) . '</span>';
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpthemeinstalllisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-theme-install-list-table.php (20750 => 20751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-theme-install-list-table.php 2012-05-09 03:58:27 UTC (rev 20750)
+++ trunk/wp-admin/includes/class-wp-theme-install-list-table.php 2012-05-09 15:01:49 UTC (rev 20751)
</span><span class="lines">@@ -198,8 +198,28 @@
</span><span class="cx"> 'action' => 'install-theme',
</span><span class="cx"> 'theme' => $theme->slug,
</span><span class="cx"> ), self_admin_url( 'update.php' ) );
</span><del>- $actions[] = '<a class="install-now" href="' . wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) . '" title="' . esc_attr( sprintf( __( 'Install %s' ), $name ) ) . '">' . __( 'Install Now' ) . '</a>';
</del><span class="cx">
</span><ins>+ $update_url = add_query_arg( array(
+ 'action' => 'upgrade-theme',
+ 'theme' => $theme->slug,
+ ), self_admin_url( 'update.php' ) );
+
+ $status = $this->_get_theme_status( $theme );
+
+ switch ( $status ) {
+ default:
+ case 'install':
+ $actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Install %s' ), $name ) ) . '">' . __( 'Install Now' ) . '</a>';
+ break;
+ case 'update_available':
+ $actions[] = '<a class="install-now" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
+ break;
+ case 'newer_installed':
+ case 'latest_installed':
+ $actions[] = '<span class="install-now" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
+ break;
+ }
+
</ins><span class="cx"> $actions[] = '<a class="install-theme-preview" href="#" title="' . esc_attr( sprintf( __( 'Preview %s' ), $name ) ) . '">' . __( 'Preview' ) . '</a>';
</span><span class="cx">
</span><span class="cx"> $actions = apply_filters( 'theme_install_actions', $actions, $theme );
</span><span class="lines">@@ -290,9 +310,28 @@
</span><span class="cx"> 'theme' => $theme->slug,
</span><span class="cx"> ), self_admin_url( 'update.php' ) );
</span><span class="cx">
</span><ins>+ $update_url = add_query_arg( array(
+ 'action' => 'upgrade-theme',
+ 'theme' => $theme->slug,
+ ), self_admin_url( 'update.php' ) );
+
+ $status = $this->_get_theme_status( $theme );
+
</ins><span class="cx"> ?>
</span><del>- <div class="install-theme-info">
- <a class="theme-install button-primary" href="<?php echo wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ); ?>"><?php _e( 'Install' ); ?></a>
</del><ins>+ <div class="install-theme-info"><?php
+ switch ( $status ) {
+ default:
+ case 'install':
+ echo '<a class="theme-install button-primary" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '">' . __( 'Install' ) . '</a>';
+ break;
+ case 'update_available':
+ echo '<a class="theme-install button-primary" href="' . esc_url( wp_nonce_url( $update_url, 'upgrade-theme_' . $theme->slug ) ) . '" title="' . esc_attr( sprintf( __( 'Update to version %s' ), $theme->version ) ) . '">' . __( 'Update' ) . '</a>';
+ break;
+ case 'newer_installed':
+ case 'latest_installed':
+ echo '<span class="theme-install" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
+ break;
+ } ?>
</ins><span class="cx"> <h3 class="theme-name"><?php echo $name; ?></h3>
</span><span class="cx"> <span class="theme-by"><?php printf( __( 'By %s' ), $author ); ?></span>
</span><span class="cx"> <?php if ( isset( $theme->screenshot_url ) ): ?>
</span><span class="lines">@@ -328,4 +367,29 @@
</span><span class="cx"> global $tab, $type;
</span><span class="cx"> parent::_js_vars( compact( 'tab', 'type' ) );
</span><span class="cx"> }
</span><ins>+
+ /**
+ * Check to see if the theme is already installed.
+ *
+ * @since 3.4
+ * @access private
+ *
+ * @param object $theme - A WordPress.org Theme API object.
+ * @return string Theme status.
+ */
+ private function _get_theme_status( $theme ) {
+ $status = 'install';
+
+ $installed_theme = wp_get_theme( $theme->slug );
+ if ( $installed_theme->exists() ) {
+ if ( version_compare( $installed_theme->get('Version'), $theme->version, '=' ) )
+ $status = 'latest_installed';
+ elseif ( version_compare( $installed_theme->get('Version'), $theme->version, '>' ) )
+ $status = 'newer_installed';
+ else
+ $status = 'update_available';
+ }
+
+ return $status;
+ }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>