WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
matt 2005-04-19 03:35:48 +00:00
parent 4d55cc850b
commit f3031d20db
12 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-admin/import-b2.php
View File

@ -4,6 +4,7 @@ require_once('../wp-config.php');
require('upgrade-functions.php'); require('upgrade-functions.php');
$step = $_GET['step']; $step = $_GET['step'];
if (!$step) $step = 0; 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"> <!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"> <html xmlns="http://www.w3.org/1999/xhtml">

1
wp-admin/import-blogger.php
View File

@ -17,6 +17,7 @@ for ($i=0; $i<count($wpvarstoreset); $i += 1) {
} }
require_once('../wp-config.php'); require_once('../wp-config.php');
require('upgrade-functions.php'); require('upgrade-functions.php');
header( 'Content-Type: text/html; charset=utf-8' );
switch ($action) { switch ($action) {
case "step1": case "step1":

1
wp-admin/import-greymatter.php
View File

@ -19,6 +19,7 @@ for ($i=0; $i<count($wpvarstoreset); $i += 1) {
} }
} }
header( 'Content-Type: text/html; charset=utf-8' );
switch ($action) { switch ($action) {

1
wp-admin/import-livejournal.php
View File

@ -17,6 +17,7 @@ require('../wp-config.php');
$step = $_GET['step']; $step = $_GET['step'];
if (!$step) $step = 0; 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"> <!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"> <html xmlns="http://www.w3.org/1999/xhtml">

1
wp-admin/import-mt.php
View File

@ -8,6 +8,7 @@ require('../wp-config.php');
require ('upgrade-functions.php'); require ('upgrade-functions.php');
$step = $_GET['step']; $step = $_GET['step'];
if (!$step) $step = 0; 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"> <!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"> <html xmlns="http://www.w3.org/1999/xhtml">

1
wp-admin/import-rss.php
View File

@ -22,6 +22,7 @@ require('../wp-config.php');
$step = $_GET['step']; $step = $_GET['step'];
if (!$step) $step = 0; 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"> <!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"> <html xmlns="http://www.w3.org/1999/xhtml">

1
wp-admin/import-textpattern.php
View File

@ -13,6 +13,7 @@ require('upgrade-functions.php');
$step = $_GET['step']; $step = $_GET['step'];
if (!$step) $step = 0; 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"> <!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"> <html xmlns="http://www.w3.org/1999/xhtml">

1
wp-admin/install.php
View File

@ -12,6 +12,7 @@ if (isset($_GET['step']))
$step = $_GET['step']; $step = $_GET['step'];
else else
$step = 0; $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"> <!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"> <html xmlns="http://www.w3.org/1999/xhtml">

3
wp-admin/setup-config.php
View File

@ -2,7 +2,7 @@
define('WP_INSTALLING', true); define('WP_INSTALLING', true);
if (file_exists('../wp-config.php')) 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')) 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.'); 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; $step = 0;
if(isset($_GET['step'])) $step = $_GET['step']; 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"> <!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"> <html xmlns="http://www.w3.org/1999/xhtml">

1
wp-includes/wp-db.php
View File

@ -301,6 +301,7 @@ class wpdb {
function bail($message) { // Just wraps errors in a nice header and footer function bail($message) { // Just wraps errors in a nice header and footer
if ( !$this->show_errors ) if ( !$this->show_errors )
return false; return false;
header( 'Content-Type: ' . get_bloginfo('html_type') . '; charset=' . get_bloginfo('charset') );
echo <<<HEAD echo <<<HEAD
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!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"> <html xmlns="http://www.w3.org/1999/xhtml">

1
wp-login.php
View File

@ -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('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
header('Cache-Control: no-cache, must-revalidate'); header('Cache-Control: no-cache, must-revalidate');
header('Pragma: no-cache'); header('Pragma: no-cache');
header('Content-Type: '.get_bloginfo('html_type').'; charset='.get_bloginfo('charset'));
if ( defined('RELOCATE') ) { // Move flag is set if ( defined('RELOCATE') ) { // Move flag is set
if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) ) if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) )

5
wp-register.php
View File

@ -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'; $action = 'disabled';
}
header( 'Content-Type: ' . get_bloginfo('html_type') . '; charset=' . get_bloginfo('charset') );
switch($action) { switch($action) {