From fdb577cfd3d25be5a14ee3d81b25dc1e8babfa80 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 6 Jan 2008 19:15:33 +0000
Subject: [PATCH] Encoding before title.  Props RanYanivHartstein. fixes #5519
 for 2.5

git-svn-id: http://svn.automattic.com/wordpress/trunk@6568 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 readme.html                                                  | 2 +-
 wp-admin/setup-config.php                                    | 3 ++-
 wp-admin/sidebar.php                                         | 4 ++--
 wp-includes/functions.php                                    | 5 +++--
 wp-includes/js/tinymce/blank.htm                             | 2 +-
 wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js | 2 +-
 .../js/tinymce/plugins/inlinepopups/jscripts/mcwindows.js    | 2 +-
 wp-includes/js/tinymce/plugins/paste/blank.htm               | 4 ++--
 wp-includes/js/tinymce/tiny_mce.js                           | 2 +-
 9 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/readme.html b/readme.html
index 636def83e2..da2378bf23 100644
--- a/readme.html
+++ b/readme.html
@@ -1,8 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>WordPress &rsaquo; ReadMe</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<title>WordPress &rsaquo; ReadMe</title>
 	<link rel="stylesheet" href="wp-admin/css/install.css" type="text/css" />
 </head>
 <body>
diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php
index 91d74dd30b..b4352657b5 100644
--- a/wp-admin/setup-config.php
+++ b/wp-admin/setup-config.php
@@ -31,8 +31,9 @@ function display_header(){
 <!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">
 <head>
-<title>WordPress &rsaquo; Setup Configuration File</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>WordPress &rsaquo; Setup Configuration File</title>
+
 <style media="screen" type="text/css">
 	<!--
 	html {
diff --git a/wp-admin/sidebar.php b/wp-admin/sidebar.php
index 4b160aff02..04fb3a040c 100644
--- a/wp-admin/sidebar.php
+++ b/wp-admin/sidebar.php
@@ -11,8 +11,8 @@ if ('b' == $_GET['a']) {
 ?><!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">
 <head>
-<title>WordPress &#8250; Posted</title>
 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=UTF-8" />
+<title>WordPress &#8250; Posted</title>
 <?php wp_admin_css(); ?>
 </head>
 <body>
@@ -26,8 +26,8 @@ if ('b' == $_GET['a']) {
 ?><!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">
 <head>
-<title>WordPress &#8250; Sidebar</title>
 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('blog_charset'); ?>" />
+<title>WordPress &#8250; Sidebar</title>
 <?php wp_admin_css(); ?>
 <style type="text/css" media="screen">
 form {
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 81f07d53b6..f38cc614c2 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1346,8 +1346,8 @@ function wp_die( $message, $title = '' ) {
 <!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 if ( function_exists( 'language_attributes' ) ) language_attributes(); ?>>
 <head>
-	<title><?php echo $title ?></title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<title><?php echo $title ?></title>
 	<link rel="stylesheet" href="<?php echo $admin_dir; ?>css/install.css" type="text/css" />
 <?php
 if ( ( $wp_locale ) && ( 'rtl' == $wp_locale->text_direction ) ) : ?>
@@ -1550,8 +1550,9 @@ function dead_db() {
 <!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 if ( function_exists( 'language_attributes' ) ) language_attributes(); ?>>
 <head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title>Database Error</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	
 </head>
 <body>
 	<h1>Error establishing a database connection</h1>
diff --git a/wp-includes/js/tinymce/blank.htm b/wp-includes/js/tinymce/blank.htm
index c1ff8352bd..0ef25247d3 100644
--- a/wp-includes/js/tinymce/blank.htm
+++ b/wp-includes/js/tinymce/blank.htm
@@ -1,7 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<title>blank_page</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<title>blank_page</title>
 </head>
 <body class="mceContentBody">
 
diff --git a/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js b/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js
index 6917032072..9b33ce3b1e 100644
--- a/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js
+++ b/wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js
@@ -397,12 +397,12 @@ TinyMCE_Windows.prototype.open = function(url, name, features) {
 	html += '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">';
 	html += '<html>';
 	html += '<head>';
+	html += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">';
 	html += '<title>Wrapper iframe</title>';
 	
 	// WordPress: put the window buttons on the left as in Macs
 	if (this.isMac) html += '<style type="text/css">.mceWindowTitle{float:none;margin:0;width:100%;text-align:center;}.mceWindowClose{float:none;position:absolute;left:0px;top:0px;}</style>';
 	
-	html += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">';
 	html += '<link href="' + this.getParam("css_file") + '" rel="stylesheet" type="text/css" />';
 	html += '</head>';
 	html += '<body onload="parent.mcWindows.onLoad(\'' + name + '\');">';
diff --git a/wp-includes/js/tinymce/plugins/inlinepopups/jscripts/mcwindows.js b/wp-includes/js/tinymce/plugins/inlinepopups/jscripts/mcwindows.js
index b28e51dc09..70f9b2f311 100644
--- a/wp-includes/js/tinymce/plugins/inlinepopups/jscripts/mcwindows.js
+++ b/wp-includes/js/tinymce/plugins/inlinepopups/jscripts/mcwindows.js
@@ -167,8 +167,8 @@ MCWindows.prototype.open = function(url, name, features) {
 	html += '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">';
 	html += '<html>';
 	html += '<head>';
-	html += '<title>Wrapper iframe</title>';
 	html += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">';
+	html += '<title>Wrapper iframe</title>';
 	html += '<link href="../jscripts/tiny_mce/themes/advanced/css/editor_ui.css" rel="stylesheet" type="text/css" />';
 	html += '</head>';
 	html += '<body onload="parent.mcWindows.onLoad(\'' + name + '\');">';
diff --git a/wp-includes/js/tinymce/plugins/paste/blank.htm b/wp-includes/js/tinymce/plugins/paste/blank.htm
index 1ddf8291e9..2c2559553b 100644
--- a/wp-includes/js/tinymce/plugins/paste/blank.htm
+++ b/wp-includes/js/tinymce/plugins/paste/blank.htm
@@ -1,7 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>blank_page</title>
+<head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<title>blank_page</title>
 	<script language="javascript">
 		function init() {
 			document.body.contentEditable = true;
diff --git a/wp-includes/js/tinymce/tiny_mce.js b/wp-includes/js/tinymce/tiny_mce.js
index 0e83794a8a..ab4aba7bf2 100644
--- a/wp-includes/js/tinymce/tiny_mce.js
+++ b/wp-includes/js/tinymce/tiny_mce.js
@@ -3875,7 +3875,7 @@ TinyMCE_Control.prototype = {
 		// Setup base HTML
 		doc = this.contentDocument;
 		if (dynamicIFrame) {
-			html = tinyMCE.getParam('doctype') + '<html><head xmlns="http://www.w3.org/1999/xhtml"><base href="' + tinyMCE.settings.base_href + '" /><title>blank_page</title><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"></head><body class="mceContentBody"></body></html>';
+			html = tinyMCE.getParam('doctype') + '<html><head xmlns="http://www.w3.org/1999/xhtml"><base href="' + tinyMCE.settings.base_href + '" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>blank_page</title></head><body class="mceContentBody"></body></html>';
 
 			try {
 				if (!this.isHidden())
