[wp-cvs] wordpress/wp-admin admin-header.php, 1.40, 1.41 bookmarklet.php, 1.20, 1.21 sidebar.php, 1.14, 1.15 upgrade-schema.php, 1.27, 1.28

Matthew Mullenweg saxmatt at users.sourceforge.net
Mon Feb 14 04:36:58 GMT 2005


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

Modified Files:
	admin-header.php bookmarklet.php sidebar.php 
	upgrade-schema.php 
Log Message:
html_type to allow for true XHTML.

Index: admin-header.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/admin-header.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** admin-header.php	12 Jan 2005 23:33:07 -0000	1.40
--- admin-header.php	14 Feb 2005 04:36:55 -0000	1.41
***************
*** 7,11 ****
  <link rel="stylesheet" href="<?php echo get_settings('siteurl') ?>/wp-admin/wp-admin.css" type="text/css" />
  <link rel="shortcut icon" href="../wp-images/wp-favicon.png" />
! <meta http-equiv="Content-Type" content="text/html; charset=<?php echo get_settings('blog_charset'); ?>" />
  
  <script type="text/javascript">
--- 7,11 ----
  <link rel="stylesheet" href="<?php echo get_settings('siteurl') ?>/wp-admin/wp-admin.css" type="text/css" />
  <link rel="shortcut icon" href="../wp-images/wp-favicon.png" />
! <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
  
  <script type="text/javascript">

Index: upgrade-schema.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/upgrade-schema.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** upgrade-schema.php	14 Feb 2005 04:17:12 -0000	1.27
--- upgrade-schema.php	14 Feb 2005 04:36:55 -0000	1.28
***************
*** 195,199 ****
  	add_option('gzipcompression', 0);
  	add_option('hack_file', 0);
! 	add_option('blog_charset', 'utf-8');
  	add_option('moderation_keys');
  	add_option('active_plugins');
--- 195,199 ----
  	add_option('gzipcompression', 0);
  	add_option('hack_file', 0);
! 	add_option('blog_charset', 'UTF-8');
  	add_option('moderation_keys');
  	add_option('active_plugins');
***************
*** 215,218 ****
--- 215,219 ----
  	add_option('open_proxy_check', 1);
  	add_option('rss_language', 'en');
+ 	add_option('html_type', 'text/html');
  
  	// Delete unused options

Index: sidebar.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/sidebar.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** sidebar.php	12 Dec 2004 20:41:15 -0000	1.14
--- sidebar.php	14 Feb 2005 04:36:55 -0000	1.15
***************
*** 16,20 ****
  <head>
  <title>WordPress &#8250; Posted</title>
! <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
  <link rel="stylesheet" href="wp-admin.css" type="text/css" />
  </head>
--- 16,20 ----
  <head>
  <title>WordPress &#8250; Posted</title>
! <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=UTF-8" />
  <link rel="stylesheet" href="wp-admin.css" type="text/css" />
  </head>
***************
*** 31,35 ****
  <head>
  <title>WordPress &#8250; Sidebar</title>
! <meta http-equiv="Content-Type" content="text/html; charset=<?php bloginfo('blog_charset'); ?>" />
  <link rel="stylesheet" href="wp-admin.css" type="text/css" />
  <link rel="shortcut icon" href="../wp-images/wp-favicon.png" />
--- 31,35 ----
  <head>
  <title>WordPress &#8250; Sidebar</title>
! <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('blog_charset'); ?>" />
  <link rel="stylesheet" href="wp-admin.css" type="text/css" />
  <link rel="shortcut icon" href="../wp-images/wp-favicon.png" />

Index: bookmarklet.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/bookmarklet.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** bookmarklet.php	12 Feb 2005 07:41:29 -0000	1.20
--- bookmarklet.php	14 Feb 2005 04:36:55 -0000	1.21
***************
*** 53,57 ****
  <head>
  <title><?php bloginfo('name') ?> &rsaquo; Bookmarklet &#8212; WordPress</title>
! <meta http-equiv="Content-Type" content="text/html; charset=<?php echo get_settings('blog_charset'); ?>" />
  <link rel="stylesheet" href="wp-admin.css" type="text/css" />
  <link rel="shortcut icon" href="../wp-images/wp-favicon.png" />
--- 53,57 ----
  <head>
  <title><?php bloginfo('name') ?> &rsaquo; Bookmarklet &#8212; WordPress</title>
! <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_settings('blog_charset'); ?>" />
  <link rel="stylesheet" href="wp-admin.css" type="text/css" />
  <link rel="shortcut icon" href="../wp-images/wp-favicon.png" />



More information about the cvs mailing list