From 399e9acf58c096cd695687c233f6735274991358 Mon Sep 17 00:00:00 2001 From: Matt Mullenweg Date: Tue, 19 Apr 2005 03:35:48 +0000 Subject: [PATCH] Be sure about encoding. Fixes http://mosquito.wordpress.org/view.php?id=1222 git-svn-id: https://develop.svn.wordpress.org/trunk@2548 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/import-b2.php | 1 + wp-admin/import-blogger.php | 5 +++-- wp-admin/import-greymatter.php | 1 + wp-admin/import-livejournal.php | 1 + wp-admin/import-mt.php | 1 + wp-admin/import-rss.php | 1 + wp-admin/import-textpattern.php | 1 + wp-admin/install.php | 1 + wp-admin/setup-config.php | 3 ++- wp-includes/wp-db.php | 1 + wp-login.php | 1 + wp-register.php | 5 +++-- 12 files changed, 17 insertions(+), 5 deletions(-) diff --git a/wp-admin/import-b2.php b/wp-admin/import-b2.php index 9667e9e089..28a84d5bb3 100644 --- a/wp-admin/import-b2.php +++ b/wp-admin/import-b2.php @@ -4,6 +4,7 @@ require_once('../wp-config.php'); require('upgrade-functions.php'); $step = $_GET['step']; if (!$step) $step = 0; +header( 'Content-Type: text/html; charset=utf-8' ); ?> diff --git a/wp-admin/import-blogger.php b/wp-admin/import-blogger.php index 8c18ffe2db..c2ca831360 100644 --- a/wp-admin/import-blogger.php +++ b/wp-admin/import-blogger.php @@ -15,8 +15,9 @@ for ($i=0; $i diff --git a/wp-admin/import-mt.php b/wp-admin/import-mt.php index f4bb2ca039..04d6ca0aa7 100644 --- a/wp-admin/import-mt.php +++ b/wp-admin/import-mt.php @@ -8,6 +8,7 @@ require('../wp-config.php'); require ('upgrade-functions.php'); $step = $_GET['step']; if (!$step) $step = 0; +header( 'Content-Type: text/html; charset=utf-8' ); ?> diff --git a/wp-admin/import-rss.php b/wp-admin/import-rss.php index 55bf89aa24..2c3efc9566 100644 --- a/wp-admin/import-rss.php +++ b/wp-admin/import-rss.php @@ -22,6 +22,7 @@ require('../wp-config.php'); $step = $_GET['step']; if (!$step) $step = 0; +header( 'Content-Type: text/html; charset=utf-8' ); ?> diff --git a/wp-admin/import-textpattern.php b/wp-admin/import-textpattern.php index 539d7294dd..b53ea2e716 100644 --- a/wp-admin/import-textpattern.php +++ b/wp-admin/import-textpattern.php @@ -13,6 +13,7 @@ require('upgrade-functions.php'); $step = $_GET['step']; if (!$step) $step = 0; +header( 'Content-Type: text/html; charset=utf-8' ); ?> diff --git a/wp-admin/install.php b/wp-admin/install.php index 1b6f7e7ae6..ba30c3d157 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -12,6 +12,7 @@ if (isset($_GET['step'])) $step = $_GET['step']; else $step = 0; +header( 'Content-Type: text/html; charset=utf-8' ); ?> diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php index 5a6826dc09..da753c195b 100644 --- a/wp-admin/setup-config.php +++ b/wp-admin/setup-config.php @@ -2,7 +2,7 @@ define('WP_INSTALLING', true); if (file_exists('../wp-config.php')) - die("The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first."); + die("The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try installing now."); if (!file_exists('../wp-config-sample.php')) die('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.'); @@ -12,6 +12,7 @@ if (!is_writable('../')) die("Sorry, I can't write to the directory. You'll have $step = 0; if(isset($_GET['step'])) $step = $_GET['step']; +header( 'Content-Type: text/html; charset=utf-8' ); ?> diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php index 597fa28161..38609ac572 100644 --- a/wp-includes/wp-db.php +++ b/wp-includes/wp-db.php @@ -301,6 +301,7 @@ class wpdb { function bail($message) { // Just wraps errors in a nice header and footer if ( !$this->show_errors ) return false; + header( 'Content-Type: ' . get_bloginfo('html_type') . '; charset=' . get_bloginfo('charset') ); echo << diff --git a/wp-login.php b/wp-login.php index 36ad3f9446..d1f8344b1f 100644 --- a/wp-login.php +++ b/wp-login.php @@ -8,6 +8,7 @@ header('Expires: Wed, 11 Jan 1984 05:00:00 GMT'); header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT'); header('Cache-Control: no-cache, must-revalidate'); header('Pragma: no-cache'); +header('Content-Type: '.get_bloginfo('html_type').'; charset='.get_bloginfo('charset')); if ( defined('RELOCATE') ) { // Move flag is set if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) ) diff --git a/wp-register.php b/wp-register.php index c7c4c8ff38..d6662da1bf 100644 --- a/wp-register.php +++ b/wp-register.php @@ -17,9 +17,10 @@ for ($i=0; $i