Changeset 42218 for trunk

Timestamp:

11/23/2017 05:23:01 AM (9 years ago)

Author:

pento

Message:

Setup: Allow for wp-config-sample.php to be formatted according to coding standards.

When the setup process reads wp-config-sample.php, it assumes that there are no spaces inside the brackes of the define()s. Unfortunately, this doesn't match our coding standards, so will no longer work correctly once we start enforcing them.

This also improves coding standards of the generated wp-config.php file.

See #41057.

File:

• trunk/src/wp-admin/setup-config.php (modified) (3 diffs)

trunk/src/wp-admin/setup-config.php

@@ -333 +333 @@
                 }
 
-                if ( ! preg_match( '/^define\(\'([A-Z_]+)\',([ ]+)/', $line, $match ) )
+                if ( ! preg_match( '/^define\(\s*\'([A-Z_]+)\',([ ]+)/', $line, $match ) )
                         continue;
 
@@ -344 +344 @@
                         case 'DB_PASSWORD' :
                         case 'DB_HOST'     :
-                                $config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . addcslashes( constant( $constant ), "\\'" ) . "');\r\n";
+                                $config_file[ $line_num ] = "define( '" . $constant . "'," . $padding . "'" . addcslashes( constant( $constant ), "\\'" ) . "' );\r\n";
                                 break;
                         case 'DB_CHARSET'  :
                                 if ( 'utf8mb4' === $wpdb->charset || ( ! $wpdb->charset && $wpdb->has_cap( 'utf8mb4' ) ) ) {
-                                        $config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'utf8mb4');\r\n";
+                                        $config_file[ $line_num ] = "define( '" . $constant . "'," . $padding . "'utf8mb4' );\r\n";
                                 }
                                 break;
@@ -359 +359 @@
                         case 'LOGGED_IN_SALT'   :
                         case 'NONCE_SALT'       :
-                                $config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . $secret_keys[$key++] . "');\r\n";
+                                $config_file[ $line_num ] = "define( '" . $constant . "'," . $padding . "'" . $secret_keys[$key++] . "' );\r\n";
                                 break;
                 }