Ticket #21316: 21316.5.patch

wp-admin/setup-config.php

@@ -54 +54 @@
 wp_unregister_GLOBALS();
 
 require_once(ABSPATH . WPINC . '/compat.php');
+require_once(ABSPATH . WPINC . '/functions.php');
 require_once(ABSPATH . WPINC . '/class-wp-error.php');
 require_once(ABSPATH . WPINC . '/formatting.php');
 
@@ -217 +218 @@
         }
 
         $key = 0;
-        foreach ( $config_file as &$line ) {
+        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;
                 }
 
@@ -234 +235 @@
                         case 'DB_USER'     :
                         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'         :
                         case 'SECURE_AUTH_KEY'  :
@@ -244 +245 @@
                         case 'SECURE_AUTH_SALT' :
                         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;
                 }
         }

wp-includes/load.php

@@ -105 +105 @@
         $php_version = phpversion();
         if ( version_compare( $required_php_version, $php_version, '>' ) ) {
                 wp_load_translations_early();
-                wp_die( sprintf( __( 'Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.' ), $php_version, $wp_version, $required_php_version ) );
+                die( sprintf( __( 'Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.' ), $php_version, $wp_version, $required_php_version ) );
         }
 
         if ( ! extension_loaded( 'mysql' ) && ! file_exists( WP_CONTENT_DIR . '/db.php' ) ) {
                 wp_load_translations_early();
-                wp_die( __( 'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.' ) );
+                die( __( 'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.' ) );
         }
 }
 
@@ -685 +685 @@
         require_once ABSPATH . WPINC . '/locale.php';
 
         // General libraries
-        require_once ABSPATH . WPINC . '/functions.php';
         require_once ABSPATH . WPINC . '/plugin.php';
 
         $locales = $locations = array();

wp-load.php

@@ -52 +52 @@
         wp_check_php_mysql_versions();
 
         // Die with an error message
+        require_once( ABSPATH . WPINC . '/functions.php' );
         $die  = __( "There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started." ) . '</p>';
         $die .= '<p>' . __( "Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ) . '</p>';
         $die .= '<p>' . __( "You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file." ) . '</p>';