<!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>[55688] trunk/src/wp-admin/includes/upgrade.php: Coding Standards: Remove an empty `else` statement in `dbDelta()`.</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 { white-space: pre-line; 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/55688">55688</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/55688","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-04-26 15:08:35 +0000 (Wed, 26 Apr 2023)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Coding Standards: Remove an empty `else` statement in `dbDelta()`.
Use `continue` to help separate each case for better readability, instead of having a wall of `if`/`elseif`.
Includes simplifying a similar fragment in `make_site_theme_from_default()`.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/1575">[1575]</a>, <a href="https://core.trac.wordpress.org/changeset/2037">[2037]</a>, <a href="https://core.trac.wordpress.org/changeset/2040">[2040]</a>, <a href="https://core.trac.wordpress.org/changeset/2044">[2044]</a>, <a href="https://core.trac.wordpress.org/changeset/2346">[2346]</a>, <a href="https://core.trac.wordpress.org/changeset/7999">[7999]</a>, <a href="https://core.trac.wordpress.org/changeset/14080">[14080]</a>, <a href="https://core.trac.wordpress.org/changeset/14485">[14485]</a>.
Props costdev, krunal265, hellofromTonya, brookedot, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/56982">#56982</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesupgradephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/upgrade.php 2023-04-26 14:38:43 UTC (rev 55687)
+++ trunk/src/wp-admin/includes/upgrade.php 2023-04-26 15:08:35 UTC (rev 55688)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2742,19 +2742,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $iqueries = array(); // Insertion queries.
</span><span class="cx" style="display: block; padding: 0 10px"> $for_update = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Create a tablename index for an array ($cqueries) of queries.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Create a tablename index for an array ($cqueries) of recognized query types.
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $queries as $qry ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '|CREATE TABLE ([^ ]*)|', $qry, $matches ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $cqueries[ trim( $matches[1], '`' ) ] = $qry;
</span><span class="cx" style="display: block; padding: 0 10px"> $for_update[ $matches[1] ] = 'Created table ' . $matches[1];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( preg_match( '|CREATE DATABASE ([^ ]*)|', $qry, $matches ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ continue;
+ }
+
+ if ( preg_match( '|CREATE DATABASE ([^ ]*)|', $qry, $matches ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> array_unshift( $cqueries, $qry );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( preg_match( '|INSERT INTO ([^ ]*)|', $qry, $matches ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ continue;
+ }
+
+ if ( preg_match( '|INSERT INTO ([^ ]*)|', $qry, $matches ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $iqueries[] = $qry;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( preg_match( '|UPDATE ([^ ]*)|', $qry, $matches ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ continue;
+ }
+
+ if ( preg_match( '|UPDATE ([^ ]*)|', $qry, $matches ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $iqueries[] = $qry;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- // Unrecognized query type.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ continue;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3073,16 +3081,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $index_data['unique'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $index_string .= 'UNIQUE ';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'FULLTEXT' === strtoupper( $index_data['index_type'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $index_string .= 'FULLTEXT ';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'SPATIAL' === strtoupper( $index_data['index_type'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $index_string .= 'SPATIAL ';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $index_string .= 'KEY ';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'primary' !== $index_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $index_string .= '`' . $index_name . '`';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $index_columns = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // For each column in the index.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3179,8 +3191,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function make_site_theme_from_oldschool( $theme_name, $template ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $home_path = get_home_path();
- $site_dir = WP_CONTENT_DIR . "/themes/$template";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $home_path = get_home_path();
+ $site_dir = WP_CONTENT_DIR . "/themes/$template";
+ $default_dir = WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! file_exists( "$home_path/index.php" ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3208,7 +3221,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'index.php' === $oldfile ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $index = implode( '', file( "$oldpath/$oldfile" ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strpos( $index, 'WP_USE_THEMES' ) !== false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! copy( WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile" ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! copy( "$default_dir/$oldfile", "$site_dir/$newfile" ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3234,10 +3247,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Update stylesheet references.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $line = str_replace( "<?php echo __get_option('siteurl'); ?>/wp-layout.css", "<?php bloginfo('stylesheet_url'); ?>", $line );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $line = str_replace(
+ "<?php echo __get_option('siteurl'); ?>/wp-layout.css",
+ "<?php bloginfo('stylesheet_url'); ?>",
+ $line
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Update comments template inclusion.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $line = str_replace( "<?php include(ABSPATH . 'wp-comments.php'); ?>", '<?php comments_template(); ?>', $line );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $line = str_replace(
+ "<?php include(ABSPATH . 'wp-comments.php'); ?>",
+ '<?php comments_template(); ?>',
+ $line
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> fwrite( $f, "{$line}\n" );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3246,7 +3267,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a theme header.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $header = "/*\nTheme Name: $theme_name\nTheme URI: " . __get_option( 'siteurl' ) . "\nDescription: A theme automatically created by the update.\nVersion: 1.0\nAuthor: Moi\n*/\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $header = "/*\n" .
+ "Theme Name: $theme_name\n" .
+ 'Theme URI: ' . __get_option( 'siteurl' ) . "\n" .
+ "Description: A theme automatically created by the update.\n" .
+ "Version: 1.0\n" .
+ "Author: Moi\n" .
+ "*/\n";
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $stylelines = file_get_contents( "$site_dir/style.css" );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $stylelines ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3284,9 +3311,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_dir( "$default_dir/$theme_file" ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! copy( "$default_dir/$theme_file", "$site_dir/$theme_file" ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> chmod( "$site_dir/$theme_file", 0777 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3298,20 +3327,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $stylelines ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $f = fopen( "$site_dir/style.css", 'w' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $headers = array(
+ 'Theme Name:' => $theme_name,
+ 'Theme URI:' => __get_option( 'url' ),
+ 'Description:' => 'Your theme.',
+ 'Version:' => '1',
+ 'Author:' => 'You',
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $stylelines as $line ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $line, 'Theme Name:' ) !== false ) {
- $line = 'Theme Name: ' . $theme_name;
- } elseif ( strpos( $line, 'Theme URI:' ) !== false ) {
- $line = 'Theme URI: ' . __get_option( 'url' );
- } elseif ( strpos( $line, 'Description:' ) !== false ) {
- $line = 'Description: Your theme.';
- } elseif ( strpos( $line, 'Version:' ) !== false ) {
- $line = 'Version: 1';
- } elseif ( strpos( $line, 'Author:' ) !== false ) {
- $line = 'Author: You';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $headers as $header => $value ) {
+ if ( strpos( $line, $header ) !== false ) {
+ $line = $header . ' ' . $value;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> fwrite( $f, $line . "\n" );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> fclose( $f );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3327,9 +3360,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_dir( "$default_dir/images/$image" ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! copy( "$default_dir/images/$image", "$site_dir/images/$image" ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> chmod( "$site_dir/images/$image", 0777 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>