<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[18982] trunk: Use IE conditionals when adding the ie8 class, introduce _wp_admin_html_begin(), props scribu, fixes #18966</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/18982">18982</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-10-17 20:57:32 +0000 (Mon, 17 Oct 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Use IE conditionals when adding the ie8 class, introduce _wp_admin_html_begin(), props scribu, fixes <a href="http://core.trac.wordpress.org/ticket/18966">#18966</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminheaderphp">trunk/wp-admin/admin-header.php</a></li>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminpressthisphp">trunk/wp-admin/press-this.php</a></li>
<li><a href="#trunkwpincludesvarsphp">trunk/wp-includes/vars.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-header.php (18981 => 18982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-header.php        2011-10-17 20:19:12 UTC (rev 18981)
+++ trunk/wp-admin/admin-header.php        2011-10-17 20:57:32 UTC (rev 18982)
</span><span class="lines">@@ -33,11 +33,8 @@
</span><span class="cx"> 
</span><span class="cx"> wp_user_settings();
</span><span class="cx"> 
</span><ins>+_wp_admin_html_begin();
</ins><span class="cx"> ?&gt;
</span><del>-&lt;!DOCTYPE html&gt;
-&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot; &lt;?php do_action('admin_xml_ns'); echo &quot;$wp_htmltag_class &quot;; language_attributes(); ?&gt;&gt;
-&lt;head&gt;
-&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;&lt;?php bloginfo('html_type'); ?&gt;; charset=&lt;?php echo get_option('blog_charset'); ?&gt;&quot; /&gt;
</del><span class="cx"> &lt;title&gt;&lt;?php echo $admin_title; ?&gt;&lt;/title&gt;
</span><span class="cx"> &lt;?php
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (18981 => 18982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php        2011-10-17 20:19:12 UTC (rev 18981)
+++ trunk/wp-admin/includes/media.php        2011-10-17 20:57:32 UTC (rev 18982)
</span><span class="lines">@@ -309,11 +309,8 @@
</span><span class="cx">  * @param unknown_type $content_func
</span><span class="cx">  */
</span><span class="cx"> function wp_iframe($content_func /* ... */) {
</span><ins>+        _wp_admin_html_begin();
</ins><span class="cx"> ?&gt;
</span><del>-&lt;!DOCTYPE html&gt;
-&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot; &lt;?php do_action('admin_xml_ns'); echo $GLOBALS['wp_htmltag_class'] . ' '; language_attributes(); ?&gt;&gt;
-&lt;head&gt;
-&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;&lt;?php bloginfo('html_type'); ?&gt;; charset=&lt;?php echo get_option('blog_charset'); ?&gt;&quot; /&gt;
</del><span class="cx"> &lt;title&gt;&lt;?php bloginfo('name') ?&gt; &amp;rsaquo; &lt;?php _e('Uploads'); ?&gt; &amp;#8212; &lt;?php _e('WordPress'); ?&gt;&lt;/title&gt;
</span><span class="cx"> &lt;?php
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (18981 => 18982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php        2011-10-17 20:19:12 UTC (rev 18981)
+++ trunk/wp-admin/includes/template.php        2011-10-17 20:57:32 UTC (rev 18982)
</span><span class="lines">@@ -1352,10 +1352,8 @@
</span><span class="cx">         global $hook_suffix, $current_screen, $current_user, $admin_body_class, $wp_locale;
</span><span class="cx">         $admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
</span><span class="cx"> 
</span><del>-?&gt;&lt;!DOCTYPE html&gt;
-&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot; &lt;?php do_action('admin_xml_ns'); echo $GLOBALS['wp_htmltag_class'] . ' '; language_attributes(); ?&gt;&gt;
-&lt;head&gt;
-&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;&lt;?php bloginfo('html_type'); ?&gt;; charset=&lt;?php echo get_option('blog_charset'); ?&gt;&quot; /&gt;
</del><ins>+        _wp_admin_html_begin();
+?&gt;
</ins><span class="cx"> &lt;title&gt;&lt;?php bloginfo('name') ?&gt; &amp;rsaquo; &lt;?php echo $title ?&gt; &amp;#8212; &lt;?php _e('WordPress'); ?&gt;&lt;/title&gt;
</span><span class="cx"> &lt;?php
</span><span class="cx"> wp_enqueue_style( 'colors' );
</span><span class="lines">@@ -1629,6 +1627,20 @@
</span><span class="cx">         return $button;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+function _wp_admin_html_begin() {
+?&gt;
+&lt;!DOCTYPE html&gt;
+&lt;!--[if IE 8]&gt;
+&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot; class=&quot;ie8&quot; &lt;?php do_action('admin_xml_ns'); ?&gt; &lt;?php language_attributes(); ?&gt;&gt;
+&lt;![endif]--&gt;
+&lt;!--[if !(IE 8) ]&gt;&lt;!--&gt;
+&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot; &lt;?php do_action('admin_xml_ns'); ?&gt; &lt;?php language_attributes(); ?&gt;&gt;
+&lt;!--&lt;![endif]--&gt;
+&lt;head&gt;
+&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;&lt;?php bloginfo('html_type'); ?&gt;; charset=&lt;?php echo get_option('blog_charset'); ?&gt;&quot; /&gt;
+&lt;?php
+}
+
</ins><span class="cx"> /**
</span><span class="cx">  * Initializes the new feature pointers.
</span><span class="cx">  *
</span></span></pre></div>
<a id="trunkwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/press-this.php (18981 => 18982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/press-this.php        2011-10-17 20:19:12 UTC (rev 18981)
+++ trunk/wp-admin/press-this.php        2011-10-17 20:57:32 UTC (rev 18982)
</span><span class="lines">@@ -280,17 +280,11 @@
</span><span class="cx"> die;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-?&gt;
-&lt;!DOCTYPE html&gt;
-&lt;html xmlns=&quot;http://www.w3.org/1999/xhtml&quot; &lt;?php do_action('admin_xml_ns'); echo &quot;$wp_htmltag_class &quot;; language_attributes(); ?&gt;&gt;
-&lt;head&gt;
-        &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;&lt;?php bloginfo('html_type'); ?&gt;; charset=&lt;?php echo get_option('blog_charset'); ?&gt;&quot; /&gt;
-        &lt;title&gt;&lt;?php _e('Press This') ?&gt;&lt;/title&gt;
-
-&lt;?php
</del><span class="cx">         wp_enqueue_style( 'colors' );
</span><span class="cx">         wp_enqueue_script( 'post' );
</span><ins>+        _wp_admin_html_begin();
</ins><span class="cx"> ?&gt;
</span><ins>+&lt;title&gt;&lt;?php _e('Press This') ?&gt;&lt;/title&gt;
</ins><span class="cx"> &lt;script type=&quot;text/javascript&quot;&gt;
</span><span class="cx"> //&lt;![CDATA[
</span><span class="cx"> addLoadEvent = function(func){if(typeof jQuery!=&quot;undefined&quot;)jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
</span></span></pre></div>
<a id="trunkwpincludesvarsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/vars.php (18981 => 18982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/vars.php        2011-10-17 20:19:12 UTC (rev 18981)
+++ trunk/wp-includes/vars.php        2011-10-17 20:57:32 UTC (rev 18982)
</span><span class="lines">@@ -74,8 +74,6 @@
</span><span class="cx"> 
</span><span class="cx"> $is_IE = ( $is_macIE || $is_winIE );
</span><span class="cx"> 
</span><del>-$wp_htmltag_class = strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 8.') ? ' class=&quot;ie8&quot;' : ''; // can't start with this
-
</del><span class="cx"> // Server detection
</span><span class="cx"> 
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>

</body>
</html>