Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-14 22:56:19 +01:00
Code Issues Projects Releases Wiki Activity

Move the CSS inline to wp_die so that it is always available. Fixes #17975, props kawauso for the style type update.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@18534 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
westi 2011-08-11 19:06:59 +00:00
parent 4207722006
commit e8f9ea22eb
1 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
wp-includes/functions.php
View File

@ -2811,15 +2811,6 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) {
$message .= "\n<p><a href='javascript:history.back()'>$back_text</p>"; $message .= "\n<p><a href='javascript:history.back()'>$back_text</p>";
} }
if ( defined( 'WP_SITEURL' ) && '' != WP_SITEURL )
$admin_dir = WP_SITEURL . '/wp-admin/';
elseif ( function_exists( 'get_bloginfo' ) && '' != 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/';
if ( !function_exists( 'did_action' ) || !did_action( 'admin_head' ) ) : if ( !function_exists( 'did_action' ) || !did_action( 'admin_head' ) ) :
if ( !headers_sent() ) { if ( !headers_sent() ) {
status_header( $r['response'] ); status_header( $r['response'] );
@ -2842,14 +2833,41 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) {
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><?php echo $title ?></title> <title><?php echo $title ?></title>
<link rel="stylesheet" href="<?php echo $admin_dir; ?>css/install.css" type="text/css" /> <style type="text/css">
<?php html {
if ( 'rtl' == $text_direction ) : ?> background: #f9f9f9;
<link rel="stylesheet" href="<?php echo $admin_dir; ?>css/install-rtl.css" type="text/css" /> }
<?php endif; ?> body {
background: #fff;
color: #333;
font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", 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;
}
<?php if ( 'rtl' == $text_direction ) : ?>
body { font-family: Tahoma, arial; }
<?php endif; ?>
</style>
</head> </head>
<body id="error-page"> <body id="error-page">
<?php endif; ?> <?php endif; // !function_exists( 'did_action' ) || !did_action( 'admin_head' ) ?>
<?php echo $message; ?> <?php echo $message; ?>
</body> </body>
</html> </html>