Changeset 28633

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.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-theme-install-list-table.php (modified) (4 diffs)
• wp-admin/includes/dashboard.php (modified) (1 diff)
• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/media.php (modified) (1 diff)
• wp-includes/category-template.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 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;
                         } ?>

trunk/src/wp-admin/includes/dashboard.php

@@ -602 +602 @@
                         <?php
                         else :
-                                switch ( $comment->comment_type ) :
-                                case 'pingback' :
-                                        $type = __( 'Pingback' );
-                                        break;
-                                case 'trackback' :
-                                        $type = __( 'Trackback' );
-                                        break;
-                                default :
-                                        $type = ucwords( $comment->comment_type );
-                                endswitch;
+                                switch ( $comment->comment_type ) {
+                                        case 'pingback' :
+                                                $type = __( 'Pingback' );
+                                                break;
+                                        case 'trackback' :
+                                                $type = __( 'Trackback' );
+                                                break;
+                                        default :
+                                                $type = ucwords( $comment->comment_type );
+                                }
                                 $type = esc_html( $type );
                         ?>

trunk/src/wp-admin/includes/schema.php

@@ -303 +303 @@
                         $queries = $ms_global_tables;
                         break;
+                case 'all' :
                 default:
-                case 'all' :
                         $queries = $global_tables . $blog_tables;
                         if ( $is_multisite )

trunk/src/wp-admin/media.php

@@ -91 +91 @@
         $class = '';
         if ( isset($_GET['message']) ) {
-                switch ( $_GET['message'] ) :
-                case 'updated' :
-                        $message = __('Media attachment updated.');
-                        $class = 'updated';
-                        break;
-                endswitch;
+                switch ( $_GET['message'] ) {
+                        case 'updated' :
+                                $message = __('Media attachment updated.');
+                                $class = 'updated';
+                                break;
+                }
         }
         if ( $message )

trunk/src/wp-includes/category-template.php

@@ -786 +786 @@
         }
 
-        switch ( $args['format'] ) :
-        case 'array' :
-                $return =& $a;
-                break;
-        case 'list' :
-                $return = "<ul class='wp-tag-cloud'>\n\t<li>";
-                $return .= join( "</li>\n\t<li>", $a );
-                $return .= "</li>\n</ul>\n";
-                break;
-        default :
-                $return = join( $args['separator'], $a );
-                break;
-        endswitch;
+        switch ( $args['format'] ) {
+                case 'array' :
+                        $return =& $a;
+                        break;
+                case 'list' :
+                        $return = "<ul class='wp-tag-cloud'>\n\t<li>";
+                        $return .= join( "</li>\n\t<li>", $a );
+                        $return .= "</li>\n</ul>\n";
+                        break;
+                default :
+                        $return = join( $args['separator'], $a );
+                        break;
+        }
 
         if ( $args['filter'] ) {

trunk/src/wp-includes/functions.php

@@ -2302 +2302 @@
                 }
                 $errors = $message->get_error_messages();
-                switch ( count( $errors ) ) :
+                switch ( count( $errors ) ) {
                 case 0 :
                         $message = '';
@@ -2312 +2312 @@
                         $message = "<ul>\n\t\t<li>" . join( "</li>\n\t\t<li>", $errors ) . "</li>\n\t</ul>";
                         break;
-                endswitch;
+                }
         } elseif ( is_string( $message ) ) {
                 $message = "<p>$message</p>";