Changeset 31090 for trunk/src/wp-admin/includes/upgrade.php

Timestamp:

01/08/2015 07:04:40 AM (11 years ago)

Author:

wonderboymusic

Message:

The keyword elseif should be used instead of else if so that all control keywords look like single words.

This was a mess, is now standardized across the codebase, except for a few 3rd-party libs.

See #30799.

File:

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

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

@@ -75 +75 @@
         update_user_option($user_id, 'default_password_nag', true, true);
         $email_password = true;
-    } else if ( !$user_id ) {
+    } elseif ( ! $user_id ) {
         // Password has been provided
         $message = '<em>'.__('Your chosen password.').'</em>';
@@ -841 +841 @@
                 $status = 'publish';
                 $type = 'page';
-            } else if ( 'attachment' == $status ) {
+            } elseif ( 'attachment' == $status ) {
                 $status = 'inherit';
                 $type = 'attachment';
@@ -1717 +1717 @@
     // Create a tablename index for an array ($cqueries) of queries
     foreach($queries as $qry) {
-        if (preg_match("|CREATE TABLE ([^ ]*)|", $qry, $matches)) {
+        if ( preg_match( "|CREATE TABLE ([^ ]*)|", $qry, $matches ) ) {
             $cqueries[ trim( $matches[1], '`' ) ] = $qry;
             $for_update[$matches[1]] = 'Created table '.$matches[1];
-        } else if (preg_match("|CREATE DATABASE ([^ ]*)|", $qry, $matches)) {
-            array_unshift($cqueries, $qry);
-        } else if (preg_match("|INSERT INTO ([^ ]*)|", $qry, $matches)) {
+        } elseif ( preg_match( "|CREATE DATABASE ([^ ]*)|", $qry, $matches ) ) {
+            array_unshift( $cqueries, $qry );
+        } elseif ( preg_match( "|INSERT INTO ([^ ]*)|", $qry, $matches ) ) {
             $iqueries[] = $qry;
-        } else if (preg_match("|UPDATE ([^ ]*)|", $qry, $matches)) {
+        } elseif ( preg_match( "|UPDATE ([^ ]*)|", $qry, $matches ) ) {
             $iqueries[] = $qry;
         } else {
@@ -1876 +1876 @@
                 if ($index_name == 'PRIMARY') {
                     $index_string .= 'PRIMARY ';
-                } else if($index_data['unique']) {
+                } elseif ( $index_data['unique'] ) {
                     $index_string .= 'UNIQUE ';
                 }