Changeset 21739 for branches/3.4/wp-admin/setup-config.php

Timestamp:

09/04/2012 08:31:14 PM (13 years ago)

Author:

nacin

Message:

Ensure we are parseable by PHP4 until wp_check_php_mysql_versions() has a chance to run.

Merges [21715], [21716] to the 3.4 branch.
props SergeyBiryukov.
fixes #21316.

File:

• branches/3.4/wp-admin/setup-config.php (modified) (4 diffs)

branches/3.4/wp-admin/setup-config.php

@@ -45 +45 @@
 require(ABSPATH . WPINC . '/version.php');
 
-// Also loads functions.php, plugin.php, l10n.php, pomo/mo.php (all required by setup-config.php)
-wp_load_translations_early();
-
 // Check for the required PHP version and for the MySQL extension or a database drop-in.
 wp_check_php_mysql_versions();
+
+require_once(ABSPATH . WPINC . '/functions.php');
+
+// Also loads plugin.php, l10n.php, pomo/mo.php (all required by setup-config.php)
+wp_load_translations_early();
 
 // Turn register_globals off.
@@ -218 +220 @@
 
     $key = 0;
-    foreach ( $config_file as &$line ) {
+    // Not a PHP5-style by-reference foreach, as this file must be parseable by PHP4.
+    foreach ( $config_file as $line_num => $line ) {
         if ( '$table_prefix  =' == substr( $line, 0, 16 ) ) {
-            $line = '$table_prefix  = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
+            $config_file[ $line_num ] = '$table_prefix  = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
             continue;
         }
@@ -235 +238 @@
             case 'DB_PASSWORD' :
             case 'DB_HOST'     :
-                $line = "define('" . $constant . "'," . $padding . "'" . addcslashes( constant( $constant ), "\\'" ) . "');\r\n";
+                $config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . addcslashes( constant( $constant ), "\\'" ) . "');\r\n";
                 break;
             case 'AUTH_KEY'         :
@@ -245 +248 @@
             case 'LOGGED_IN_SALT'   :
             case 'NONCE_SALT'       :
-                $line = "define('" . $constant . "'," . $padding . "'" . $secret_keys[$key++] . "');\r\n";
+                $config_file[ $line_num ] = "define('" . $constant . "'," . $padding . "'" . $secret_keys[$key++] . "');\r\n";
                 break;
         }