Send nocache_headers() on installation screens and when redirecting to them.

fixes #29248.
Built from https://develop.svn.wordpress.org/trunk@29599


git-svn-id: http://core.svn.wordpress.org/trunk@29373 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2014-08-25 17:40:16 +00:00
parent a20fc80aeb
commit fa8e82efab
3 changed files with 10 additions and 1 deletions

View File

@ -41,6 +41,8 @@ require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
/** Load wpdb */
require_once( ABSPATH . WPINC . '/wp-db.php' );
nocache_headers();
$step = isset( $_GET['step'] ) ? (int) $_GET['step'] : 0;
/**

View File

@ -34,6 +34,8 @@ require( ABSPATH . 'wp-settings.php' );
require( ABSPATH . 'wp-admin/includes/upgrade.php' );
nocache_headers();
// Support wp-config-sample.php one level up, for the develop repo.
if ( file_exists( ABSPATH . 'wp-config-sample.php' ) )
$config_file = file( ABSPATH . 'wp-config-sample.php' );

View File

@ -466,9 +466,14 @@ function wp_start_object_cache() {
*/
function wp_not_installed() {
if ( is_multisite() ) {
if ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) )
if ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) ) {
nocache_headers();
wp_die( __( 'The site you have requested is not installed properly. Please contact the system administrator.' ) );
}
} elseif ( ! is_blog_installed() && false === strpos( $_SERVER['PHP_SELF'], 'install.php' ) && !defined( 'WP_INSTALLING' ) ) {
nocache_headers();
require( ABSPATH . WPINC . '/kses.php' );
require( ABSPATH . WPINC . '/pluggable.php' );
require( ABSPATH . WPINC . '/formatting.php' );