Changeset 42343 for trunk/src/wp-admin/upgrade.php

Timestamp:

11/30/2017 11:09:33 PM (7 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

• trunk/src/wp-admin/upgrade.php (modified) (5 diffs)

trunk/src/wp-admin/upgrade.php

@@ -23 +23 @@
 require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
-delete_site_transient('update_core');
+delete_site_transient( 'update_core' );
 
-if ( isset( $_GET['step'] ) )
+if ( isset( $_GET['step'] ) ) {
     $step = $_GET['step'];
-else
+} else {
     $step = 0;
+}
 
 // Do it. No output.
@@ -46 +47 @@
 $step = (int) $step;
 
-$php_version    = phpversion();
-$mysql_version  = $wpdb->db_version();
-$php_compat     = version_compare( $php_version, $required_php_version, '>=' );
-if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
+$php_version   = phpversion();
+$mysql_version = $wpdb->db_version();
+$php_compat    = version_compare( $php_version, $required_php_version, '>=' );
+if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) {
     $mysql_compat = true;
-else
+} else {
     $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' );
+}
 
 @header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
@@ -71 +73 @@
 <p id="logo"><a href="<?php echo esc_url( __( 'https://wordpress.org/' ) ); ?>" tabindex="-1"><?php _e( 'WordPress' ); ?></a></p>
 
-<?php if ( get_option( 'db_version' ) == $wp_db_version || !is_blog_installed() ) : ?>
+<?php if ( get_option( 'db_version' ) == $wp_db_version || ! is_blog_installed() ) : ?>
 
 <h1><?php _e( 'No Update Required' ); ?></h1>
@@ -77 +79 @@
 <p class="step"><a class="button button-large" href="<?php echo get_option( 'home' ); ?>/"><?php _e( 'Continue' ); ?></a></p>
 
-<?php elseif ( !$php_compat || !$mysql_compat ) :
-    if ( !$mysql_compat && !$php_compat )
-        printf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
-    elseif ( !$php_compat )
-        printf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version );
-    elseif ( !$mysql_compat )
-        printf( __('You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version );
+<?php
+elseif ( ! $php_compat || ! $mysql_compat ) :
+    if ( ! $mysql_compat && ! $php_compat ) {
+        printf( __( 'You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.' ), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version );
+    } elseif ( ! $php_compat ) {
+        printf( __( 'You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_php_version, $php_version );
+    } elseif ( ! $mysql_compat ) {
+        printf( __( 'You cannot update because <a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.' ), $wp_version, $required_mysql_version, $mysql_version );
+    }
 ?>
-<?php else :
-switch ( $step ) :
-    case 0:
-        $goback = wp_get_referer();
-        if ( $goback ) {
-            $goback = esc_url_raw( $goback );
-            $goback = urlencode( $goback );
-        }
-?>
-<h1><?php _e( 'Database Update Required' ); ?></h1>
+<?php
+else :
+    switch ( $step ) :
+        case 0:
+            $goback = wp_get_referer();
+            if ( $goback ) {
+                $goback = esc_url_raw( $goback );
+                $goback = urlencode( $goback );
+            }
+    ?>
+    <h1><?php _e( 'Database Update Required' ); ?></h1>
 <p><?php _e( 'WordPress has been updated! Before we send you on your way, we have to update your database to the newest version.' ); ?></p>
 <p><?php _e( 'The database update process may take a little while, so please be patient.' ); ?></p>
 <p class="step"><a class="button button-large button-primary" href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e( 'Update WordPress Database' ); ?></a></p>
 <?php
-        break;
-    case 1:
-        wp_upgrade();
+            break;
+        case 1:
+            wp_upgrade();
 
-            $backto = !empty($_GET['backto']) ? wp_unslash( urldecode( $_GET['backto'] ) ) : __get_option( 'home' ) . '/';
+            $backto = ! empty( $_GET['backto'] ) ? wp_unslash( urldecode( $_GET['backto'] ) ) : __get_option( 'home' ) . '/';
             $backto = esc_url( $backto );
-            $backto = wp_validate_redirect($backto, __get_option( 'home' ) . '/');
-?>
-<h1><?php _e( 'Update Complete' ); ?></h1>
+            $backto = wp_validate_redirect( $backto, __get_option( 'home' ) . '/' );
+    ?>
+    <h1><?php _e( 'Update Complete' ); ?></h1>
     <p><?php _e( 'Your WordPress database has been successfully updated!' ); ?></p>
     <p class="step"><a class="button button-large" href="<?php echo $backto; ?>"><?php _e( 'Continue' ); ?></a></p>
@@ -120 +125 @@
 
 <?php
-        break;
+            break;
 endswitch;
 endif;