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

Content-Type, not Content-type, as headers are case sensitive. Props foolswisdom and Nazgul. fixes #3545 

git-svn-id: http://svn.automattic.com/wordpress/trunk@5640 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
rob1n 2007-06-02 05:21:18 +00:00
parent 64820ed1ae
commit 9ce729e656
15 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/admin-header.php
View File

@ -1,5 +1,5 @@
<?php <?php
@header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
if (!isset($_GET["page"])) require_once('admin.php'); if (!isset($_GET["page"])) require_once('admin.php');
if ( $editing ) { if ( $editing ) {
wp_enqueue_script( array('dbx-admin-key?pagenow=' . attribute_escape($pagenow),'admin-custom-fields') ); wp_enqueue_script( array('dbx-admin-key?pagenow=' . attribute_escape($pagenow),'admin-custom-fields') );

2
wp-admin/export.php
View File

@ -51,7 +51,7 @@ $filename = 'wordpress.' . date('Y-m-d') . '.xml';
header('Content-Description: File Transfer'); header('Content-Description: File Transfer');
header("Content-Disposition: attachment; filename=$filename"); header("Content-Disposition: attachment; filename=$filename");
header('Content-type: text/xml; charset=' . get_option('blog_charset'), true); header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
$where = ''; $where = '';
if ( isset( $_GET['author'] ) && $_GET['author'] != 'all' ) { if ( isset( $_GET['author'] ) && $_GET['author'] != 'all' ) {

2
wp-admin/index-extra.php
View File

@ -2,7 +2,7 @@
require_once('admin.php'); require_once('admin.php');
require_once (ABSPATH . WPINC . '/rss.php'); require_once (ABSPATH . WPINC . '/rss.php');
@header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
switch ( $_GET['jax'] ) { switch ( $_GET['jax'] ) {

2
wp-admin/upgrade.php
View File

@ -11,7 +11,7 @@ if (isset($_GET['step']))
$step = (int) $_GET['step']; $step = (int) $_GET['step'];
else else
$step = 0; $step = 0;
@header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
?> ?>
<!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" <?php language_attributes(); ?>> <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>

2
wp-admin/upload.php
View File

@ -1,7 +1,7 @@
<?php <?php
require_once('admin.php'); require_once('admin.php');
@header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
if (!current_user_can('upload_files')) if (!current_user_can('upload_files'))
wp_die(__('You do not have permission to upload files.')); wp_die(__('You do not have permission to upload files.'));

2
wp-comments-post.php
View File

@ -2,7 +2,7 @@
if ($_SERVER["REQUEST_METHOD"] != "POST") { if ($_SERVER["REQUEST_METHOD"] != "POST") {
header('Allow: POST'); header('Allow: POST');
header("HTTP/1.1 405 Method Not Allowed"); header("HTTP/1.1 405 Method Not Allowed");
header("Content-type: text/plain"); header("Content-Type: text/plain");
exit; exit;
} }
require( dirname(__FILE__) . '/wp-config.php' ); require( dirname(__FILE__) . '/wp-config.php' );

6
wp-includes/classes.php
View File

@ -176,9 +176,9 @@ class WP {
status_header( 404 ); status_header( 404 );
if ( !is_user_logged_in() ) if ( !is_user_logged_in() )
nocache_headers(); nocache_headers();
@header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
} else if ( empty($this->query_vars['feed']) ) { } else if ( empty($this->query_vars['feed']) ) {
@header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
} else { } else {
// We're showing a feed, so WP is indeed the only thing that last changed // We're showing a feed, so WP is indeed the only thing that last changed
if ( $this->query_vars['withcomments'] if ( $this->query_vars['withcomments']
@ -729,7 +729,7 @@ class WP_Ajax_Response {
} }
function send() { function send() {
header('Content-type: text/xml'); header('Content-Type: text/xml');
echo "<?xml version='1.0' standalone='yes'?><wp_ajax>"; echo "<?xml version='1.0' standalone='yes'?><wp_ajax>";
foreach ( $this->responses as $response ) foreach ( $this->responses as $response )
echo $response; echo $response;

2
wp-includes/feed-atom.php
View File

@ -1,5 +1,5 @@
<?php <?php
header('Content-type: application/atom+xml; charset=' . get_option('blog_charset'), true); header('Content-Type: application/atom+xml; charset=' . get_option('blog_charset'), true);
$more = 1; $more = 1;
?> ?>

2
wp-includes/feed-rdf.php
View File

@ -1,5 +1,5 @@
<?php <?php
header('Content-type: application/rdf+xml; charset=' . get_option('blog_charset'), true); header('Content-Type: application/rdf+xml; charset=' . get_option('blog_charset'), true);
$more = 1; $more = 1;
?> ?>

2
wp-includes/feed-rss.php
View File

@ -1,5 +1,5 @@
<?php <?php
header('Content-type: text/xml; charset=' . get_option('blog_charset'), true); header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
$more = 1; $more = 1;
?> ?>

2
wp-includes/feed-rss2-comments.php
View File

@ -1,5 +1,5 @@
<?php <?php
header('Content-type: text/xml;charset=' . get_option('blog_charset'), true); header('Content-Type: text/xml;charset=' . get_option('blog_charset'), true);
echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
?> ?>

2
wp-includes/feed-rss2.php
View File

@ -1,5 +1,5 @@
<?php <?php
header('Content-type: text/xml; charset=' . get_option('blog_charset'), true); header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
$more = 1; $more = 1;
?> ?>

4
wp-includes/functions.php
View File

@ -743,7 +743,7 @@ function nocache_headers() {
function cache_javascript_headers() { function cache_javascript_headers() {
$expiresOffset = 864000; // 10 days $expiresOffset = 864000; // 10 days
header("Content-type: text/javascript; charset=" . get_bloginfo('charset')); header("Content-Type: text/javascript; charset=" . get_bloginfo('charset'));
header("Vary: Accept-Encoding"); // Handle proxies header("Vary: Accept-Encoding"); // Handle proxies
header("Expires: " . gmdate("D, d M Y H:i:s", time() + $expiresOffset) . " GMT"); header("Expires: " . gmdate("D, d M Y H:i:s", time() + $expiresOffset) . " GMT");
} }
@ -797,7 +797,7 @@ function do_feed_atom($for_comments) {
} }
function do_robots() { function do_robots() {
header('Content-type: text/plain; charset=utf-8'); header('Content-Type: text/plain; charset=utf-8');
do_action('do_robotstxt'); do_action('do_robotstxt');

2
wp-links-opml.php
View File

@ -5,7 +5,7 @@ if (empty($wp)) {
wp(); wp();
} }
header('Content-type: text/xml; charset=' . get_option('blog_charset'), true); header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
$link_cat = $_GET['link_cat']; $link_cat = $_GET['link_cat'];
if ((empty ($link_cat)) || ($link_cat == 'all') || ($link_cat == '0')) { if ((empty ($link_cat)) || ($link_cat == 'all') || ($link_cat == '0')) {
$link_cat = ''; $link_cat = '';

2
xmlrpc.php
View File

@ -18,7 +18,7 @@ if ( isset($HTTP_RAW_POST_DATA) )
include('./wp-config.php'); include('./wp-config.php');
if ( isset( $_GET['rsd'] ) ) { // http://archipelago.phrasewise.com/rsd if ( isset( $_GET['rsd'] ) ) { // http://archipelago.phrasewise.com/rsd
header('Content-type: text/xml; charset=' . get_option('blog_charset'), true); header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
?> ?>
<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?> <?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>