Changeset 28633 for trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php

Timestamp:

05/30/2014 05:57:51 PM (12 years ago)

Author:

wonderboymusic

Message:

Cleanup for switch statements:

• Move default to the bottom in WP_Theme_Install_List_Table
• switch/endswitch syntax is not supported in Hack. Switch to switch (...) { .... } syntax. (A few template-type instances linger).

Fixes #28409.
See #27881.

File:

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

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

@@ -245 +245 @@
 
                 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>';
@@ -255 +251 @@
                         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;
+                        case 'install':
+                        default:
+                                $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;
                 }
@@ -368 +368 @@
                 <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>';
@@ -378 +374 @@
                                 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;
+                                case 'install':
+                                default:
+                                        echo '<a class="theme-install button-primary" href="' . esc_url( wp_nonce_url( $install_url, 'install-theme_' . $theme->slug ) ) . '">' . __( 'Install' ) . '</a>';
                                         break;
                         } ?>