From 519af69e93328e74aa66ac40b68ec463072dde6f Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 9 May 2012 15:01:49 +0000
Subject: [PATCH] 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 #20618


git-svn-id: http://core.svn.wordpress.org/trunk@20751 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 .../class-wp-plugin-install-list-table.php    |  2 +-
 .../class-wp-theme-install-list-table.php     | 70 ++++++++++++++++++-
 2 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/wp-admin/includes/class-wp-plugin-install-list-table.php b/wp-admin/includes/class-wp-plugin-install-list-table.php
index 64a1ea7cc..4cf1c1641 100644
--- a/wp-admin/includes/class-wp-plugin-install-list-table.php
+++ b/wp-admin/includes/class-wp-plugin-install-list-table.php
@@ -203,7 +203,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table {
 						break;
 					case 'latest_installed':
 					case 'newer_installed':
-						$action_links[] = '<span title="' . esc_attr__( 'This plugin is already installed and is up to date' ) . ' ">' . __( 'Installed' ) . '</span>';
+						$action_links[] = '<span title="' . esc_attr__( 'This plugin is already installed and is up to date' ) . ' ">' . _x( 'Installed', 'plugin' ) . '</span>';
 						break;
 				}
 			}
diff --git a/wp-admin/includes/class-wp-theme-install-list-table.php b/wp-admin/includes/class-wp-theme-install-list-table.php
index 842a8ffc6..be846991a 100644
--- a/wp-admin/includes/class-wp-theme-install-list-table.php
+++ b/wp-admin/includes/class-wp-theme-install-list-table.php
@@ -198,7 +198,27 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 			'action' => 'install-theme',
 			'theme'  => $theme->slug,
 		), self_admin_url( 'update.php' ) );
-		$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>';
+
+		$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;
+		}
 
 		$actions[] = '<a class="install-theme-preview" href="#" title="' . esc_attr( sprintf( __( 'Preview %s' ), $name ) ) . '">' . __( 'Preview' ) . '</a>';
 
@@ -290,9 +310,28 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 			'theme'  => $theme->slug,
 		), self_admin_url( 'update.php' ) );
 
+		$update_url = add_query_arg( array(
+			'action' => 'upgrade-theme',
+			'theme'  => $theme->slug,
+		), self_admin_url( 'update.php' ) );
+
+		$status = $this->_get_theme_status( $theme );
+
 		?>
-		<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>
+		<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;
+			} ?>
 			<h3 class="theme-name"><?php echo $name; ?></h3>
 			<span class="theme-by"><?php printf( __( 'By %s' ), $author ); ?></span>
 			<?php if ( isset( $theme->screenshot_url ) ): ?>
@@ -328,4 +367,29 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table {
 		global $tab, $type;
 		parent::_js_vars( compact( 'tab', 'type' ) );
 	}
+
+	/**
+	 * 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;
+	}
 }