<!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>[28633] trunk/src: Cleanup for `switch` statements:</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/28633">28633</a></dd>
<dt>Author</dt> <dd>wonderboymusic</dd>
<dt>Date</dt> <dd>2014-05-30 17:57:51 +0000 (Fri, 30 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://core.trac.wordpress.org/ticket/28409">#28409</a>.
See <a href="http://core.trac.wordpress.org/ticket/27881">#27881</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpthemeinstalllisttablephp">trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunksrcwpadminincludesschemaphp">trunk/src/wp-admin/includes/schema.php</a></li>
<li><a href="#trunksrcwpadminmediaphp">trunk/src/wp-admin/media.php</a></li>
<li><a href="#trunksrcwpincludescategorytemplatephp">trunk/src/wp-includes/category-template.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpthemeinstalllisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php (28632 => 28633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php 2014-05-30 17:37:36 UTC (rev 28632)
+++ trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php 2014-05-30 17:57:51 UTC (rev 28633)
</span><span class="lines">@@ -244,10 +244,6 @@
</span><span class="cx"> $status = $this->_get_theme_status( $theme );
</span><span class="cx">
</span><span class="cx"> switch ( $status ) {
</span><del>- 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;
</del><span class="cx"> case 'update_available':
</span><span class="cx"> $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>';
</span><span class="cx"> break;
</span><span class="lines">@@ -255,6 +251,10 @@
</span><span class="cx"> case 'latest_installed':
</span><span class="cx"> $actions[] = '<span class="install-now" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
</span><span class="cx"> break;
</span><ins>+ 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;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $actions[] = '<a class="install-theme-preview" href="' . esc_url( $preview_url ) . '" title="' . esc_attr( sprintf( __( 'Preview %s' ), $name ) ) . '">' . __( 'Preview' ) . '</a>';
</span><span class="lines">@@ -367,10 +367,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> <div class="install-theme-info"><?php
</span><span class="cx"> switch ( $status ) {
</span><del>- 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;
</del><span class="cx"> case 'update_available':
</span><span class="cx"> 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>';
</span><span class="cx"> break;
</span><span class="lines">@@ -378,6 +374,10 @@
</span><span class="cx"> case 'latest_installed':
</span><span class="cx"> echo '<span class="theme-install" title="' . esc_attr__( 'This theme is already installed and is up to date' ) . '">' . _x( 'Installed', 'theme' ) . '</span>';
</span><span class="cx"> break;
</span><ins>+ 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;
</ins><span class="cx"> } ?>
</span><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></pre></div>
<a id="trunksrcwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/dashboard.php (28632 => 28633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/dashboard.php 2014-05-30 17:37:36 UTC (rev 28632)
+++ trunk/src/wp-admin/includes/dashboard.php 2014-05-30 17:57:51 UTC (rev 28633)
</span><span class="lines">@@ -601,16 +601,16 @@
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> else :
</span><del>- switch ( $comment->comment_type ) :
- case 'pingback' :
- $type = __( 'Pingback' );
- break;
- case 'trackback' :
- $type = __( 'Trackback' );
- break;
- default :
- $type = ucwords( $comment->comment_type );
- endswitch;
</del><ins>+ switch ( $comment->comment_type ) {
+ case 'pingback' :
+ $type = __( 'Pingback' );
+ break;
+ case 'trackback' :
+ $type = __( 'Trackback' );
+ break;
+ default :
+ $type = ucwords( $comment->comment_type );
+ }
</ins><span class="cx"> $type = esc_html( $type );
</span><span class="cx"> ?>
</span><span class="cx"> <div class="dashboard-comment-wrap">
</span></span></pre></div>
<a id="trunksrcwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/schema.php (28632 => 28633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/schema.php 2014-05-30 17:37:36 UTC (rev 28632)
+++ trunk/src/wp-admin/includes/schema.php 2014-05-30 17:57:51 UTC (rev 28633)
</span><span class="lines">@@ -302,8 +302,8 @@
</span><span class="cx"> case 'ms_global' :
</span><span class="cx"> $queries = $ms_global_tables;
</span><span class="cx"> break;
</span><ins>+ case 'all' :
</ins><span class="cx"> default:
</span><del>- case 'all' :
</del><span class="cx"> $queries = $global_tables . $blog_tables;
</span><span class="cx"> if ( $is_multisite )
</span><span class="cx"> $queries .= $ms_global_tables;
</span></span></pre></div>
<a id="trunksrcwpadminmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/media.php (28632 => 28633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/media.php 2014-05-30 17:37:36 UTC (rev 28632)
+++ trunk/src/wp-admin/media.php 2014-05-30 17:57:51 UTC (rev 28633)
</span><span class="lines">@@ -90,12 +90,12 @@
</span><span class="cx"> $message = '';
</span><span class="cx"> $class = '';
</span><span class="cx"> if ( isset($_GET['message']) ) {
</span><del>- switch ( $_GET['message'] ) :
- case 'updated' :
- $message = __('Media attachment updated.');
- $class = 'updated';
- break;
- endswitch;
</del><ins>+ switch ( $_GET['message'] ) {
+ case 'updated' :
+ $message = __('Media attachment updated.');
+ $class = 'updated';
+ break;
+ }
</ins><span class="cx"> }
</span><span class="cx"> if ( $message )
</span><span class="cx"> echo "<div id='message' class='$class'><p>$message</p></div>\n";
</span></span></pre></div>
<a id="trunksrcwpincludescategorytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/category-template.php (28632 => 28633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/category-template.php 2014-05-30 17:37:36 UTC (rev 28632)
+++ trunk/src/wp-includes/category-template.php 2014-05-30 17:57:51 UTC (rev 28633)
</span><span class="lines">@@ -785,19 +785,19 @@
</span><span class="cx"> . $args['unit'] . ";'>$tag_name</a>";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- 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;
</del><ins>+ 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;
+ }
</ins><span class="cx">
</span><span class="cx"> if ( $args['filter'] ) {
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/functions.php (28632 => 28633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/functions.php 2014-05-30 17:37:36 UTC (rev 28632)
+++ trunk/src/wp-includes/functions.php 2014-05-30 17:57:51 UTC (rev 28633)
</span><span class="lines">@@ -2301,7 +2301,7 @@
</span><span class="cx"> $title = $error_data['title'];
</span><span class="cx"> }
</span><span class="cx"> $errors = $message->get_error_messages();
</span><del>- switch ( count( $errors ) ) :
</del><ins>+ switch ( count( $errors ) ) {
</ins><span class="cx"> case 0 :
</span><span class="cx"> $message = '';
</span><span class="cx"> break;
</span><span class="lines">@@ -2311,7 +2311,7 @@
</span><span class="cx"> default :
</span><span class="cx"> $message = "<ul>\n\t\t<li>" . join( "</li>\n\t\t<li>", $errors ) . "</li>\n\t</ul>";
</span><span class="cx"> break;
</span><del>- endswitch;
</del><ins>+ }
</ins><span class="cx"> } elseif ( is_string( $message ) ) {
</span><span class="cx"> $message = "<p>$message</p>";
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>