Changeset 6987

Timestamp:

02/22/2008 10:07:53 PM (17 years ago)

Author:

ryan

Message:

Show messages with message styling instead of error styling. fixes #5929

File:

• trunk/wp-login.php (modified) (2 diffs)

trunk/wp-login.php

@@ -36 +36 @@
 
     if ( $wp_error->get_error_code() ) {
-        $errors = "\n";
-        foreach ( $wp_error->get_error_messages() as $error )
-            $errors .= '    ' . $error . "<br />\n";
-
-        echo '<div id="login_error">' . apply_filters('login_errors', $errors) . "</div>\n";
+        $errors = '';
+        $messages = '';
+        foreach ( $wp_error->get_error_codes() as $code ) {
+            $severity = $wp_error->get_error_data($code);
+            foreach ( $wp_error->get_error_messages($code) as $error ) {
+                if ( 'message' == $severity )
+                    $messages .= '  ' . $error . "<br />\n";
+                else
+                    $errors .= '    ' . $error . "<br />\n";
+            }
+        }
+        if ( !empty($errors) )
+            echo '<div id="login_error">' . apply_filters('login_errors', $errors) . "</div>\n";
+        if ( !empty($messages) )
+            echo '<p class="message">' . apply_filters('login_messages', $messages) . "</p>\n";
     }
 } // End of login_header()
@@ -350 +360 @@
 
     // Some parts of this script use the main login form to display a message
-    if      ( isset($_GET['loggedout']) && TRUE == $_GET['loggedout'] )         $errors->add('loggedout', __('You are now logged out.'));
+    if      ( isset($_GET['loggedout']) && TRUE == $_GET['loggedout'] )         $errors->add('loggedout', __('You are now logged out.'), 'message');
     elseif  ( isset($_GET['registration']) && 'disabled' == $_GET['registration'] ) $errors->add('registerdiabled', __('User registration is currently not allowed.'));
-    elseif  ( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] )  $errors->add('confirm', __('Check your e-mail for the confirmation link.'));
-    elseif  ( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] )  $errors->add('newpass', __('Check your e-mail for your new password.'));
-    elseif  ( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] )   $errors->add('registered', __('Registration complete. Please check your e-mail.'));
+    elseif  ( isset($_GET['checkemail']) && 'confirm' == $_GET['checkemail'] )  $errors->add('confirm', __('Check your e-mail for the confirmation link.'), 'message');
+    elseif  ( isset($_GET['checkemail']) && 'newpass' == $_GET['checkemail'] )  $errors->add('newpass', __('Check your e-mail for your new password.'), 'message');
+    elseif  ( isset($_GET['checkemail']) && 'registered' == $_GET['checkemail'] )   $errors->add('registered', __('Registration complete. Please check your e-mail.'), 'message');
 
     login_header(__('Login'), '', $errors);