[wp-cvs] wordpress wp-atom.php, 1.21, 1.22 wp-blog-header.php, 1.126, 1.127 wp-login.php, 1.59, 1.60 wp-register.php, 1.27, 1.28 wp.php, 1.8, 1.9

Mon Feb 14 04:36:59 GMT 2005

Update of /cvsroot/cafelog/wordpress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8228

Modified Files:
	wp-atom.php wp-blog-header.php wp-login.php wp-register.php 
	wp.php 
Log Message:
html_type to allow for true XHTML.

Index: wp-blog-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-blog-header.php,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** wp-blog-header.php	14 Feb 2005 04:29:53 -0000	1.126
--- wp-blog-header.php	14 Feb 2005 04:36:56 -0000	1.127
***************
*** 113,117 ****
   } else if ( empty($feed) ) {
  	@header('X-Pingback: '. get_bloginfo('pingback_url'));
! 	@header('Content-type: text/html; charset=' . get_option('blog_charset'));
  } else {
  	// We're showing a feed, so WP is indeed the only thing that last changed
--- 113,117 ----
   } else if ( empty($feed) ) {
  	@header('X-Pingback: '. get_bloginfo('pingback_url'));
! 	@header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
  } else {
  	// We're showing a feed, so WP is indeed the only thing that last changed

Index: wp-login.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-login.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** wp-login.php	7 Feb 2005 06:43:23 -0000	1.59
--- wp-login.php	14 Feb 2005 04:36:56 -0000	1.60
***************
*** 40,44 ****
  <head>
  	<title>WordPress &raquo; <?php _e('Lost Password') ?></title>
! 	<meta http-equiv="Content-Type" content="text/html; charset=<?php bloginfo('charset'); ?>" />
  	<link rel="stylesheet" href="<?php echo get_settings('siteurl'); ?>/wp-admin/wp-admin.css" type="text/css" />
  	<script type="text/javascript">
--- 40,44 ----
  <head>
  	<title>WordPress &raquo; <?php _e('Lost Password') ?></title>
! 	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
  	<link rel="stylesheet" href="<?php echo get_settings('siteurl'); ?>/wp-admin/wp-admin.css" type="text/css" />
  	<script type="text/javascript">
***************
*** 197,201 ****
  <head>
  	<title>WordPress &rsaquo; <?php _e('Login') ?></title>
! 	<meta http-equiv="Content-Type" content="text/html; charset=<?php bloginfo('charset'); ?>" />
  	<link rel="stylesheet" href="<?php bloginfo('wpurl'); ?>/wp-admin/wp-admin.css" type="text/css" />
  	<script type="text/javascript">
--- 197,201 ----
  <head>
  	<title>WordPress &rsaquo; <?php _e('Login') ?></title>
! 	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
  	<link rel="stylesheet" href="<?php bloginfo('wpurl'); ?>/wp-admin/wp-admin.css" type="text/css" />
  	<script type="text/javascript">

Index: wp-register.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-register.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** wp-register.php	11 Feb 2005 00:51:39 -0000	1.27
--- wp-register.php	14 Feb 2005 04:36:56 -0000	1.28
***************
*** 89,93 ****
  <head>
  	<title>WordPress &raquo; <?php _e('Registration Complete') ?></title>
! 	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo get_settings('blog_charset'); ?>" />	
  	<link rel="stylesheet" href="wp-admin/wp-admin.css" type="text/css" />
  	<style type="text/css">
--- 89,93 ----
  <head>
  	<title>WordPress &raquo; <?php _e('Registration Complete') ?></title>
! 	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />	
  	<link rel="stylesheet" href="wp-admin/wp-admin.css" type="text/css" />
  	<style type="text/css">
***************
*** 119,123 ****
  <head>
  	<title>WordPress &raquo; <?php _e('Registration Currently Disabled') ?></title>
! 	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo get_settings('blog_charset'); ?>">
  	<link rel="stylesheet" href="wp-admin/wp-admin.css" type="text/css">
  </head>
--- 119,123 ----
  <head>
  	<title>WordPress &raquo; <?php _e('Registration Currently Disabled') ?></title>
! 	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>">
  	<link rel="stylesheet" href="wp-admin/wp-admin.css" type="text/css">
  </head>
***************
*** 145,149 ****
  <head>
  	<title>WordPress &raquo; <?php _e('Registration Form') ?></title>
! 	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo get_settings('blog_charset'); ?>" />
  	<link rel="stylesheet" href="wp-admin/wp-admin.css" type="text/css" />
  	<style type="text/css">
--- 145,149 ----
  <head>
  	<title>WordPress &raquo; <?php _e('Registration Form') ?></title>
! 	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
  	<link rel="stylesheet" href="wp-admin/wp-admin.css" type="text/css" />
  	<style type="text/css">

Index: wp.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** wp.php	5 Sep 2004 07:30:59 -0000	1.8
--- wp.php	14 Feb 2005 04:36:56 -0000	1.9
***************
*** 8,12 ****
  <head>
  	<title><?php bloginfo('name'); ?><?php wp_title(); ?></title>
! 	<meta http-equiv="Content-Type" content="text/html; charset=<?php echo get_settings('blog_charset'); ?>" />
  	<meta name="generator" content="WordPress <?php $wp_version ?>" /> <!-- leave this for stats -->
  	<link rel="alternate" type="text/xml" title="RSS" href="<?php bloginfo('rss2_url'); ?>" />
--- 8,12 ----
  <head>
  	<title><?php bloginfo('name'); ?><?php wp_title(); ?></title>
! 	<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
  	<meta name="generator" content="WordPress <?php $wp_version ?>" /> <!-- leave this for stats -->
  	<link rel="alternate" type="text/xml" title="RSS" href="<?php bloginfo('rss2_url'); ?>" />

Index: wp-atom.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-atom.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** wp-atom.php	14 Feb 2005 04:17:12 -0000	1.21
--- wp-atom.php	14 Feb 2005 04:36:56 -0000	1.22
***************
*** 36,48 ****
  		<issued>  <?php the_time('Y-m-d\TH:i:s\Z'); ?></issued>
  		<?php the_category_rss('rdf') ?>
! 		<summary type="text/html" mode="escaped"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
  <?php if (!get_settings('rss_use_excerpt')) : ?>
  	<?php if ( strlen( $post->post_content ) ) : ?>
! 		<content type="text/html" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content>
  	<?php else : ?>
! 		<content type="text/html" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_excerpt_rss(); ?>]]></content>
  	<?php endif; ?>
  <?php else : ?>
! 		<content type="text/html" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_excerpt_rss() ?>]]></content>
  <?php endif; ?>
  <?php rss_enclosure(); ?>
--- 36,48 ----
  		<issued>  <?php the_time('Y-m-d\TH:i:s\Z'); ?></issued>
  		<?php the_category_rss('rdf') ?>
! 		<summary type="<?php bloginfo('html_type'); ?>" mode="escaped"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
  <?php if (!get_settings('rss_use_excerpt')) : ?>
  	<?php if ( strlen( $post->post_content ) ) : ?>
! 		<content type="<?php bloginfo('html_type'); ?>" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content>
  	<?php else : ?>
! 		<content type="<?php bloginfo('html_type'); ?>" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_excerpt_rss(); ?>]]></content>
  	<?php endif; ?>
  <?php else : ?>
! 		<content type="<?php bloginfo('html_type'); ?>" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_excerpt_rss() ?>]]></content>
  <?php endif; ?>
  <?php rss_enclosure(); ?>