<!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>[18534] trunk/wp-includes/functions.php: Move the CSS inline to wp_die so that it is always available.</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/18534">18534</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2011-08-11 19:06:59 +0000 (Thu, 11 Aug 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Move the CSS inline to wp_die so that it is always available. Fixes <a href="http://core.trac.wordpress.org/ticket/17975">#17975</a>, props kawauso for the style type update.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (18533 => 18534)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php        2011-08-11 18:17:30 UTC (rev 18533)
+++ trunk/wp-includes/functions.php        2011-08-11 19:06:59 UTC (rev 18534)
</span><span class="lines">@@ -2811,30 +2811,21 @@
</span><span class="cx">                 $message .= &quot;\n&lt;p&gt;&lt;a href='javascript:history.back()'&gt;$back_text&lt;/p&gt;&quot;;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        if ( defined( 'WP_SITEURL' ) &amp;&amp; '' != WP_SITEURL )
-                $admin_dir = WP_SITEURL . '/wp-admin/';
-        elseif ( function_exists( 'get_bloginfo' ) &amp;&amp; '' != get_bloginfo( 'wpurl' ) )
-                $admin_dir = get_bloginfo( 'wpurl' ) . '/wp-admin/';
-        elseif ( strpos( $_SERVER['PHP_SELF'], 'wp-admin' ) !== false )
-                $admin_dir = '';
-        else
-                $admin_dir = 'wp-admin/';
-
</del><span class="cx">         if ( !function_exists( 'did_action' ) || !did_action( 'admin_head' ) ) :
</span><del>-        if ( !headers_sent() ) {
-                status_header( $r['response'] );
-                nocache_headers();
-                header( 'Content-Type: text/html; charset=utf-8' );
-        }
-
-        if ( empty($title) )
-                $title = $have_gettext ? __('WordPress &amp;rsaquo; Error') : 'WordPress &amp;rsaquo; Error';
-
-        $text_direction = 'ltr';
-        if ( isset($r['text_direction']) &amp;&amp; 'rtl' == $r['text_direction'] )
-                $text_direction = 'rtl';
-        elseif ( function_exists( 'is_rtl' ) &amp;&amp; is_rtl() )
-                $text_direction = 'rtl';
</del><ins>+                if ( !headers_sent() ) {
+                        status_header( $r['response'] );
+                        nocache_headers();
+                        header( 'Content-Type: text/html; charset=utf-8' );
+                }
+        
+                if ( empty($title) )
+                        $title = $have_gettext ? __('WordPress &amp;rsaquo; Error') : 'WordPress &amp;rsaquo; Error';
+        
+                $text_direction = 'ltr';
+                if ( isset($r['text_direction']) &amp;&amp; 'rtl' == $r['text_direction'] )
+                        $text_direction = 'rtl';
+                elseif ( function_exists( 'is_rtl' ) &amp;&amp; is_rtl() )
+                        $text_direction = 'rtl';
</ins><span class="cx"> ?&gt;
</span><span class="cx"> &lt;!DOCTYPE html&gt;
</span><span class="cx"> &lt;!-- Ticket #11289, IE bug fix: always pad the error page with enough characters such that it is greater than 512 bytes, even after gzip compression abcdefghijklmnopqrstuvwxyz1234567890aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz11223344556677889900abacbcbdcdcededfefegfgfhghgihihjijikjkjlklkmlmlnmnmononpopoqpqprqrqsrsrtstsubcbcdcdedefefgfabcadefbghicjkldmnoepqrfstugvwxhyz1i234j567k890laabmbccnddeoeffpgghqhiirjjksklltmmnunoovppqwqrrxsstytuuzvvw0wxx1yyz2z113223434455666777889890091abc2def3ghi4jkl5mno6pqr7stu8vwx9yz11aab2bcc3dd4ee5ff6gg7hh8ii9j0jk1kl2lmm3nnoo4p5pq6qrr7ss8tt9uuvv0wwx1x2yyzz13aba4cbcb5dcdc6dedfef8egf9gfh0ghg1ihi2hji3jik4jkj5lkl6kml7mln8mnm9ono --&gt;
</span><span class="lines">@@ -2842,14 +2833,41 @@
</span><span class="cx"> &lt;head&gt;
</span><span class="cx">         &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=utf-8&quot; /&gt;
</span><span class="cx">         &lt;title&gt;&lt;?php echo $title ?&gt;&lt;/title&gt;
</span><del>-        &lt;link rel=&quot;stylesheet&quot; href=&quot;&lt;?php echo $admin_dir; ?&gt;css/install.css&quot; type=&quot;text/css&quot; /&gt;
-&lt;?php
-if ( 'rtl' == $text_direction ) : ?&gt;
-        &lt;link rel=&quot;stylesheet&quot; href=&quot;&lt;?php echo $admin_dir; ?&gt;css/install-rtl.css&quot; type=&quot;text/css&quot; /&gt;
-&lt;?php endif; ?&gt;
</del><ins>+        &lt;style type=&quot;text/css&quot;&gt;
+                html {
+                        background: #f9f9f9;
+                }
+                body {
+                        background: #fff;
+                        color: #333;
+                        font-family: &quot;Lucida Grande&quot;, Verdana, Arial, &quot;Bitstream Vera Sans&quot;, sans-serif;
+                        margin: 2em auto;
+                        width: 700px;
+                        padding: 1em 2em;
+                        -moz-border-radius: 11px;
+                        -khtml-border-radius: 11px;
+                        -webkit-border-radius: 11px;
+                        border-radius: 11px;
+                        border: 1px solid #dfdfdf;
+                }
+                #error-page {
+                        margin-top: 50px;
+                }
+                #error-page p {
+                        font-size: 12px;
+                        line-height: 18px;
+                        margin: 25px 0 20px;
+                }
+                #error-page code {
+                        font-family: Consolas, Monaco, monospace;
+                }
+                &lt;?php if ( 'rtl' == $text_direction ) : ?&gt;
+                body { font-family: Tahoma, arial; }
+                &lt;?php endif; ?&gt;
+        &lt;/style&gt;
</ins><span class="cx"> &lt;/head&gt;
</span><span class="cx"> &lt;body id=&quot;error-page&quot;&gt;
</span><del>-&lt;?php endif; ?&gt;
</del><ins>+&lt;?php endif; // !function_exists( 'did_action' ) || !did_action( 'admin_head' ) ?&gt;
</ins><span class="cx">         &lt;?php echo $message; ?&gt;
</span><span class="cx"> &lt;/body&gt;
</span><span class="cx"> &lt;/html&gt;
</span></span></pre>
</div>
</div>

</body>
</html>