- Patch #10983 by TDobes: failed logon attempts produce nonsensical watchdog message.

f8080719 · Dries · fc1884d5 · f8080719 · f8080719
Commit f8080719 authored Sep 21, 2004 by Dries
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

modules/user.module modules/user.module +1 -1

modules/user/user.module modules/user/user.module +1 -1

No files found.
--- a/modules/user.module
+++ b/modules/user.module
@@ -765,7 +765,7 @@ function user_login($edit = array(), $msg = '') {
      if (!$error) {
        $error = t('Sorry.  Unrecognized username or password.') .' '. l(t('Have you forgotten your password?'), 'user/password');
      }
-      watchdog('user', t('Login attempt failed for %user: %error.', array('%user' => '<em>'. $server ? ($name .'@'. $server) : $name .'</em>', '%error' => "<em>$error</em>")));
+      watchdog('user', t('Login attempt failed for %user: %error.', array('%user' => '<em>'. $edit['name'] .'</em>', '%error' => '<em>'. $error .'</em>')));
    }
  }


--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -765,7 +765,7 @@ function user_login($edit = array(), $msg = '') {
      if (!$error) {
        $error = t('Sorry.  Unrecognized username or password.') .' '. l(t('Have you forgotten your password?'), 'user/password');
      }
-      watchdog('user', t('Login attempt failed for %user: %error.', array('%user' => '<em>'. $server ? ($name .'@'. $server) : $name .'</em>', '%error' => "<em>$error</em>")));
+      watchdog('user', t('Login attempt failed for %user: %error.', array('%user' => '<em>'. $edit['name'] .'</em>', '%error' => '<em>'. $error .'</em>')));
    }
  }