diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-10-09 11:39:17 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-10-09 11:39:17 +0000 |
| commit | 75e0ccc3a64e164d036da4f71f458520ddea3b24 (patch) | |
| tree | 94f00db692e25c95030f7984c27178e1bd7e1bcd /wp-login.php | |
| parent | ca036ad95fc44c318275ab539a52f1eb6fddf060 (diff) | |
| download | wordpress-mu-75e0ccc3a64e164d036da4f71f458520ddea3b24.tar.gz wordpress-mu-75e0ccc3a64e164d036da4f71f458520ddea3b24.tar.xz wordpress-mu-75e0ccc3a64e164d036da4f71f458520ddea3b24.zip | |
WP Merge - needs testing.
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@797 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-login.php')
| -rw-r--r-- | wp-login.php | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/wp-login.php b/wp-login.php index c70515b..cfc10f7 100644 --- a/wp-login.php +++ b/wp-login.php @@ -23,15 +23,18 @@ if ( defined('RELOCATE') ) { // Move flag is set // Rather than duplicating this HTML all over the place, we'll stick it in function function login_header($title = 'Login', $message = '') { - global $errors, $error; + global $errors, $error, $wp_locale; ?> <!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"> +<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>> <head> <title><?php bloginfo('name'); ?> › <?php echo $title; ?></title> <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" /> <link rel="stylesheet" href="<?php bloginfo('wpurl'); ?>/wp-admin/wp-admin.css?version=<?php bloginfo('version'); ?>" type="text/css" /> +<?php if ( ('rtl' == $wp_locale->text_direction) ) : ?> + <link rel="stylesheet" href="<?php bloginfo('wpurl'); ?>/wp-admin/rtl.css?version=<?php bloginfo('version'); ?>" type="text/css" /> +<?php endif; ?> <!--[if IE]><style type="text/css">#login h1 a { margin-top: 35px; } #login ul { padding-bottom: 65px; }</style><![endif]--><!-- Curse you, IE! --> <script type="text/javascript"> function focusit() { @@ -43,8 +46,7 @@ function login_header($title = 'Login', $message = '') { </head> <body> -<div id="login"> -<h1><a href="<?php echo apply_filters('login_headerurl', 'http://' . $current_site->domain . $current_site->path ); ?>" title="<?php echo apply_filters('login_headertitle', $current_site->site_name ); ?>"><span class="hide"><?php bloginfo('name'); ?></span></a></h1> +<div id="login"><h1><a href="<?php echo apply_filters('login_headerurl', 'http://' . $current_site->domain . $current_site->path ); ?>" title="<?php echo apply_filters('login_headertitle', $current_site->site_name ); ?>"><span class="hide"><?php bloginfo('name'); ?></span></a></h1> <?php if ( !empty( $message ) ) echo apply_filters('login_message', $message) . "\n"; @@ -210,9 +212,9 @@ default: $redirect_to = $_REQUEST['redirect_to']; if ( $_POST ) { - $user_login = $_POST['user_login']; + $user_login = $_POST['log']; $user_login = sanitize_user( $user_login ); - $user_pass = $_POST['user_pass']; + $user_pass = $_POST['pwd']; $rememberme = $_POST['rememberme']; } else { $cookie_login = wp_get_cookie_login(); @@ -264,11 +266,11 @@ default: <form name="loginform" id="loginform" action="wp-login.php" method="post"> <p> <label><?php _e('Username:') ?><br /> - <input type="text" name="user_login" id="user_login" class="input" value="<?php echo wp_specialchars(stripslashes($user_login), 1); ?>" size="20" tabindex="10" /></label> + <input type="text" name="log" id="user_login" class="input" value="<?php echo wp_specialchars(stripslashes($user_login), 1); ?>" size="20" tabindex="10" /></label> </p> <p> <label><?php _e('Password:') ?><br /> - <input type="password" name="user_pass" id="user_pass" class="input" value="" size="20" tabindex="20" /></label> + <input type="password" name="pwd" id="user_pass" class="input" value="" size="20" tabindex="20" /></label> </p> <?php do_action('login_form'); ?> <p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="90" /> <?php _e('Remember me'); ?></label></p> |