Changeset 21716 for trunk/wp-admin/setup-config.php

Timestamp:

09/04/2012 02:46:01 AM (14 years ago)

Author:

nacin

Message:

setup-config.php must be parseable by PHP4 so we can show a sane error message. wp-admin/index.php should ideally be as well. props SergeyBiryukov, see #21316.

File:

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

trunk/wp-admin/setup-config.php

@@ -220 +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;
                 }
@@ -237 +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'         :
@@ -247 +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;
                 }