Be sure about encoding. Fixes http://mosquito.wordpress.org/view.php?id=1222
git-svn-id: http://svn.automattic.com/wordpress/trunk@2548 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
4d55cc850b
commit
f3031d20db
|
@ -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' );
|
||||
?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
|
|
|
@ -17,6 +17,7 @@ for ($i=0; $i<count($wpvarstoreset); $i += 1) {
|
|||
}
|
||||
require_once('../wp-config.php');
|
||||
require('upgrade-functions.php');
|
||||
header( 'Content-Type: text/html; charset=utf-8' );
|
||||
switch ($action) {
|
||||
|
||||
case "step1":
|
||||
|
|
|
@ -19,6 +19,7 @@ for ($i=0; $i<count($wpvarstoreset); $i += 1) {
|
|||
}
|
||||
}
|
||||
|
||||
header( 'Content-Type: text/html; charset=utf-8' );
|
||||
|
||||
switch ($action) {
|
||||
|
||||
|
|
|
@ -17,6 +17,7 @@ require('../wp-config.php');
|
|||
|
||||
$step = $_GET['step'];
|
||||
if (!$step) $step = 0;
|
||||
header( 'Content-Type: text/html; charset=utf-8' );
|
||||
?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
|
|
|
@ -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' );
|
||||
?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
|
|
|
@ -22,6 +22,7 @@ require('../wp-config.php');
|
|||
|
||||
$step = $_GET['step'];
|
||||
if (!$step) $step = 0;
|
||||
header( 'Content-Type: text/html; charset=utf-8' );
|
||||
?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
|
|
|
@ -13,6 +13,7 @@ require('upgrade-functions.php');
|
|||
|
||||
$step = $_GET['step'];
|
||||
if (!$step) $step = 0;
|
||||
header( 'Content-Type: text/html; charset=utf-8' );
|
||||
?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
|
|
|
@ -12,6 +12,7 @@ if (isset($_GET['step']))
|
|||
$step = $_GET['step'];
|
||||
else
|
||||
$step = 0;
|
||||
header( 'Content-Type: text/html; charset=utf-8' );
|
||||
?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
|
|
|
@ -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 <a href='install.php'>installing now</a>.");
|
||||
|
||||
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' );
|
||||
?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
|
|
|
@ -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 <<<HEAD
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
|
|
|
@ -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']) )
|
||||
|
|
|
@ -17,9 +17,10 @@ for ($i=0; $i<count($wpvarstoreset); $i += 1) {
|
|||
}
|
||||
}
|
||||
|
||||
if (!get_settings('users_can_register')) {
|
||||
if ( !get_settings('users_can_register') )
|
||||
$action = 'disabled';
|
||||
}
|
||||
|
||||
header( 'Content-Type: ' . get_bloginfo('html_type') . '; charset=' . get_bloginfo('charset') );
|
||||
|
||||
switch($action) {
|
||||
|
||||
|
|
Loading…
Reference in New Issue