X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/d954c87a1e3f0e671855614661da9e5825279134..refs/tags/wordpress-3.4:/wp-login.php
diff --git a/wp-login.php b/wp-login.php
index c97edd93..0b1df607 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -39,11 +39,10 @@ if ( force_ssl_admin() && !is_ssl() ) {
* @param WP_Error $wp_error Optional. WordPress Error Object
*/
function login_header($title = 'Log In', $message = '', $wp_error = '') {
- global $error, $is_iphone, $interim_login, $current_site;
+ global $error, $interim_login, $current_site, $customize_login;
// Don't index any of these forms
- add_filter( 'pre_option_blog_public', '__return_zero' );
- add_action( 'login_head', 'noindex' );
+ add_action( 'login_head', 'wp_no_robots' );
if ( empty($wp_error) )
$wp_error = new WP_Error();
@@ -55,43 +54,55 @@ function login_header($title = 'Log In', $message = '', $wp_error = '') {
if ( $shake_error_codes && $wp_error->get_error_code() && in_array( $wp_error->get_error_code(), $shake_error_codes ) )
add_action( 'login_head', 'wp_shake_js', 12 );
- ?>
-
->
-
- ›
+ ?>
+ >
+
- ›
+
-
-
-
-
-
+ site_name;
+ } else {
+ $login_header_url = __( 'http://wordpress.org/' );
+ $login_header_title = __( 'Powered by WordPress' );
}
- do_action('login_head'); ?>
-
-
-
-
-
-
-
+
+
+
+
+ add('error', $error);
unset($error);
@@ -115,9 +126,38 @@ function login_header($title = 'Log In', $message = '', $wp_error = '') {
echo '
' . apply_filters('login_messages', $messages) . "
\n";
}
} // End of login_header()
+
+/**
+ * Outputs the footer for the login page.
+ *
+ * @param string $input_id Which input to auto-focus
+ */
+function login_footer($input_id = '') {
+ global $interim_login;
+
+ // Don't allow interim logins to navigate away from the page.
+ if ( ! $interim_login ): ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
' . __( 'Your password has been reset.' ) . '
' . __( 'Log in' ) . '' );
+ login_footer();
+ exit;
+ }
+
+ wp_enqueue_script('utils');
+ wp_enqueue_script('user-profile');
+
+ login_header(__('Reset Password'), '
' . __('Enter your new password below.') . '
', $errors );
+
+?>
+
+
+
+
+ |
+
+
+
+' . __('Register For This Site') . '', $errors);
?>
-
- |
-
+ |
+
-
-
-
-
-
-