From 57c399a00fe7d2bc07b2958ebfd3099cc66d955f Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 20 Sep 2001 18:57:21 +0000
Subject: [PATCH] - got rid of some unused warning / error messages

---
 modules/user.module      | 4 ++--
 modules/user/user.module | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/user.module b/modules/user.module
index 0144f6009f5d..826d61c9374e 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -444,7 +444,7 @@ function user_login($edit = array()) {
     ** Try to log on the user through Drupal:
     */
 
-    if (!$user && variable_get("user_drupal", 1) == 1 && $id = drupal_auth($name, $pass, $server)) {
+    if (!$user && $server && variable_get("user_drupal", 1) == 1 && $id = drupal_auth($name, $pass, $server)) {
       $user = user_load(array("drupal" => "$id@$server", "status" => 1));
 
       if (!$user && variable_get("user_register", 1) == 1 && !user_load(array("name" => $name))) {
@@ -457,7 +457,7 @@ function user_login($edit = array()) {
     ** Try to log on the user through Jabber:
     */
 
-    if (!$user && variable_get("user_jabber", 1) == 1 && jabber_auth($name, $pass, $server)) {
+    if (!$user && $server && variable_get("user_jabber", 1) == 1 && jabber_auth($name, $pass, $server)) {
       $user = user_load(array("jabber" => "$name@$server", "status" => 1));
       if (!$user && variable_get("user_register", 1) == 1 && !user_load(array("name" => "$name"))) {
         watchdog("user", "new user: '$name' &lt;$name@$server&gt; (Jabber ID)");
diff --git a/modules/user/user.module b/modules/user/user.module
index 0144f6009f5d..826d61c9374e 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -444,7 +444,7 @@ function user_login($edit = array()) {
     ** Try to log on the user through Drupal:
     */
 
-    if (!$user && variable_get("user_drupal", 1) == 1 && $id = drupal_auth($name, $pass, $server)) {
+    if (!$user && $server && variable_get("user_drupal", 1) == 1 && $id = drupal_auth($name, $pass, $server)) {
       $user = user_load(array("drupal" => "$id@$server", "status" => 1));
 
       if (!$user && variable_get("user_register", 1) == 1 && !user_load(array("name" => $name))) {
@@ -457,7 +457,7 @@ function user_login($edit = array()) {
     ** Try to log on the user through Jabber:
     */
 
-    if (!$user && variable_get("user_jabber", 1) == 1 && jabber_auth($name, $pass, $server)) {
+    if (!$user && $server && variable_get("user_jabber", 1) == 1 && jabber_auth($name, $pass, $server)) {
       $user = user_load(array("jabber" => "$name@$server", "status" => 1));
       if (!$user && variable_get("user_register", 1) == 1 && !user_load(array("name" => "$name"))) {
         watchdog("user", "new user: '$name' &lt;$name@$server&gt; (Jabber ID)");
-- 
GitLab