From 0123495cb7bf1382db009c33cbe219c238b1186c Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 15 Jun 2004 00:16:59 +0000
Subject: [PATCH] errors when invalid login

---
 ChangeLog                       | 2 ++
 libraries/dbi/mysql.dbi.lib.php | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3772e188c..84c4563f7 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,8 @@ $Source$
     * libraries/common.lib.php: proper revision check
     * libraries/select_theme.lib.php: remove unneeded counter, and fix
       undefined $PHP_SELF
+    * libraries/dbi/mysql.dbi.lib.php: errors on mysql_errno() when the 
+      login is invalid
 
 2004-06-13 Marc Delisle  <lem9@users.sourceforge.net>
     * many files: redesign part 3, thanks to Michael Keck (mkkeck).
diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
index a8c86f2f5..95b34f9f3 100644
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/libraries/dbi/mysql.dbi.lib.php
@@ -1,7 +1,7 @@
 <?php
 /* $Id$ */
 // vim: expandtab sw=4 ts=4 sts=4:
-
+error_reporting(E_ALL);
 /**
  * Interface to the classic MySQL extension
  */
@@ -197,13 +197,13 @@ function PMA_DBI_getError($link = NULL) {
     if (mysql_errno()) {
         $error = mysql_errno();
         $error_message = mysql_error();
-    } else {
+    } elseif ($link) {
         $error = mysql_errno($link);
         $error_message = mysql_error($link);
     }
 
     // keep the error number for further check after the call to PMA_DBI_getError() 
-    if ($error) {
+    if (isset($error) && $error) {
         $GLOBALS['errno'] = $error;
     } else {
         return FALSE;
@@ -212,7 +212,7 @@ function PMA_DBI_getError($link = NULL) {
 // Some errors messages cannot be obtained by mysql_error()
     if ($error && $error == 2003) {
         $error = '#' . ((string) $error) . ' - ' . $GLOBALS['strServerNotResponding'];
-    } elseif ($error && PMA_MYSQL_INT_VERSION >= 40100) {
+    } elseif ($error && defined('PMA_MYSQL_INT_VERSION') && PMA_MYSQL_INT_VERSION >= 40100) {
         $error = '#' . ((string) $error) . ' - ' . $error_message;
     } elseif ($error) {
         $error = '#' . ((string) $error) . ' - ' . PMA_convert_display_charset($error_message);