Changeset 12752 for trunk/wp-admin/includes/upgrade.php

Timestamp:

01/18/2010 08:34:48 PM (15 years ago)

Author:

ryan

Message:

Coding standards, space after if

File:

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

trunk/wp-admin/includes/upgrade.php

@@ -268 +268 @@
         return;
 
-    if( ! is_blog_installed() )
+    if ( ! is_blog_installed() )
         return;
 
@@ -632 +632 @@
     // populate comment_count field of posts table
     $comments = $wpdb->get_results( "SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID" );
-    if( is_array( $comments ) )
+    if ( is_array( $comments ) )
         foreach ($comments as $comment)
             $wpdb->update( $wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID) );
@@ -1200 +1200 @@
 
     // Separate individual queries into an array
-    if( !is_array($queries) ) {
+    if ( !is_array($queries) ) {
         $queries = explode( ';', $queries );
-        if('' == $queries[count($queries) - 1]) array_pop($queries);
+        if ('' == $queries[count($queries) - 1]) array_pop($queries);
     }
 
@@ -1211 +1211 @@
     // 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( strtolower($matches[1]), '`' )] = $qry;
             $for_update[$matches[1]] = 'Created table '.$matches[1];
-        }
-        else if(preg_match("|CREATE DATABASE ([^ ]*)|", $qry, $matches)) {
+        } else if (preg_match("|CREATE DATABASE ([^ ]*)|", $qry, $matches)) {
             array_unshift($cqueries, $qry);
-        }
-        else if(preg_match("|INSERT INTO ([^ ]*)|", $qry, $matches)) {
+        } else if (preg_match("|INSERT INTO ([^ ]*)|", $qry, $matches)) {
             $iqueries[] = $qry;
-        }
-        else if(preg_match("|UPDATE ([^ ]*)|", $qry, $matches)) {
+        } else if (preg_match("|UPDATE ([^ ]*)|", $qry, $matches)) {
             $iqueries[] = $qry;
-        }
-        else {
+        } else {
             // Unrecognized query type
         }
@@ -1230 +1226 @@
 
     // Check to see which tables and fields exist
-    if($tables = $wpdb->get_col('SHOW TABLES;')) {
+    if ($tables = $wpdb->get_col('SHOW TABLES;')) {
         // For every table in the database
-        foreach($tables as $table) {
+        foreach ($tables as $table) {
             // If a table query exists for the database table...
-            if( array_key_exists(strtolower($table), $cqueries) ) {
+            if ( array_key_exists(strtolower($table), $cqueries) ) {
                 // Clear the field and index arrays
                 unset($cfields);
@@ -1248 +1244 @@
 
                 // For every field line specified in the query
-                foreach($flds as $fld) {
+                foreach ($flds as $fld) {
                     // Extract the field name
                     preg_match("|^([^ ]*)|", trim($fld), $fvals);
@@ -1255 +1251 @@
                     // Verify the found field name
                     $validfield = true;
-                    switch(strtolower($fieldname))
-                    {
+                    switch (strtolower($fieldname)) {
                     case '':
                     case 'primary':
@@ -1270 +1265 @@
 
                     // If it's a valid field, add it to the field array
-                    if($validfield) {
+                    if ($validfield) {
                         $cfields[strtolower($fieldname)] = trim($fld, ", \n");
                     }
@@ -1279 +1274 @@
 
                 // For every field in the table
-                foreach($tablefields as $tablefield) {
+                foreach ($tablefields as $tablefield) {
                     // If the table field exists in the field array...
-                    if(array_key_exists(strtolower($tablefield->Field), $cfields)) {
+                    if (array_key_exists(strtolower($tablefield->Field), $cfields)) {
                         // Get the field type from the query
                         preg_match("|".$tablefield->Field." ([^ ]*( unsigned)?)|i", $cfields[strtolower($tablefield->Field)], $matches);
@@ -1287 +1282 @@
 
                         // Is actual field type different from the field type in query?
-                        if($tablefield->Type != $fieldtype) {
+                        if ($tablefield->Type != $fieldtype) {
                             // Add a query to change the column type
                             $cqueries[] = "ALTER TABLE {$table} CHANGE COLUMN {$tablefield->Field} " . $cfields[strtolower($tablefield->Field)];
@@ -1295 +1290 @@
                         // Get the default value from the array
                             //echo "{$cfields[strtolower($tablefield->Field)]}<br>";
-                        if(preg_match("| DEFAULT '(.*)'|i", $cfields[strtolower($tablefield->Field)], $matches)) {
+                        if (preg_match("| DEFAULT '(.*)'|i", $cfields[strtolower($tablefield->Field)], $matches)) {
                             $default_value = $matches[1];
-                            if($tablefield->Default != $default_value)
-                            {
+                            if ($tablefield->Default != $default_value) {
                                 // Add a query to change the column's default value
                                 $cqueries[] = "ALTER TABLE {$table} ALTER COLUMN {$tablefield->Field} SET DEFAULT '{$default_value}'";
@@ -1307 +1301 @@
                         // Remove the field from the array (so it's not added)
                         unset($cfields[strtolower($tablefield->Field)]);
-                    }
-                    else {
+                    } else {
                         // This field exists in the table, but not in the creation queries?
                     }
@@ -1314 +1307 @@
 
                 // For every remaining field specified for the table
-                foreach($cfields as $fieldname => $fielddef) {
+                foreach ($cfields as $fieldname => $fielddef) {
                     // Push a query line into $cqueries that adds the field to that table
                     $cqueries[] = "ALTER TABLE {$table} ADD COLUMN $fielddef";
@@ -1324 +1317 @@
                 $tableindices = $wpdb->get_results("SHOW INDEX FROM {$table};");
 
-                if($tableindices) {
+                if ($tableindices) {
                     // Clear the index array
                     unset($index_ary);
 
                     // For every index in the table
-                    foreach($tableindices as $tableindex) {
+                    foreach ($tableindices as $tableindex) {
                         // Add the index to the index data array
                         $keyname = $tableindex->Key_name;
@@ -1337 +1330 @@
 
                     // For each actual index in the index array
-                    foreach($index_ary as $index_name => $index_data) {
+                    foreach ($index_ary as $index_name => $index_data) {
                         // Build a create string to compare to the query
                         $index_string = '';
-                        if($index_name == 'PRIMARY') {
+                        if ($index_name == 'PRIMARY') {
                             $index_string .= 'PRIMARY ';
-                        }
-                        else if($index_data['unique']) {
+                        } else if($index_data['unique']) {
                             $index_string .= 'UNIQUE ';
                         }
                         $index_string .= 'KEY ';
-                        if($index_name != 'PRIMARY') {
+                        if ($index_name != 'PRIMARY') {
                             $index_string .= $index_name;
                         }
                         $index_columns = '';
                         // For each column in the index
-                        foreach($index_data['columns'] as $column_data) {
-                            if($index_columns != '') $index_columns .= ',';
+                        foreach ($index_data['columns'] as $column_data) {
+                            if ($index_columns != '') $index_columns .= ',';
                             // Add the field to the column list string
                             $index_columns .= $column_data['fieldname'];
-                            if($column_data['subpart'] != '') {
+                            if ($column_data['subpart'] != '') {
                                 $index_columns .= '('.$column_data['subpart'].')';
                             }
@@ -1362 +1354 @@
                         // Add the column list to the index create string
                         $index_string .= ' ('.$index_columns.')';
-                        if(!(($aindex = array_search($index_string, $indices)) === false)) {
+                        if (!(($aindex = array_search($index_string, $indices)) === false)) {
                             unset($indices[$aindex]);
                             //echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br />Found index:".$index_string."</pre>\n";
@@ -1387 +1379 @@
 
     $allqueries = array_merge($cqueries, $iqueries);
-    if($execute) {
-        foreach($allqueries as $query) {
+    if ($execute) {
+        foreach ($allqueries as $query) {
             //echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">".print_r($query, true)."</pre>\n";
             $wpdb->query($query);