[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12053-g5f88427

[Piotr Przybylski]

The branch, master has been updated
       via  5f8842739de809166475ffb763dbaccb6d755728 (commit)
      from  e82682d0e4037d92305ad92cb5514e822e9a5abc (commit)


- Log -----------------------------------------------------------------
commit 5f8842739de809166475ffb763dbaccb6d755728
Author: Piotr Przybylski <piotrprz at gmail.com>
Date:   Wed Jul 27 21:26:28 2011 +0200

    Remove invalid usage of $php_errormsg

-----------------------------------------------------------------------

Summary of changes:
 libraries/auth/config.auth.lib.php |    8 +-------
 libraries/auth/signon.auth.lib.php |    2 --
 libraries/dbi/mysql.dbi.lib.php    |    2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/libraries/auth/config.auth.lib.php b/libraries/auth/config.auth.lib.php
index 5c98d25..e90e0bf 100644
--- a/libraries/auth/config.auth.lib.php
+++ b/libraries/auth/config.auth.lib.php
@@ -66,15 +66,9 @@ function PMA_auth_set_user()
  */
 function PMA_auth_fails()
 {
-    global $php_errormsg, $cfg;
-
     $conn_error = PMA_DBI_getError();
     if (!$conn_error) {
-        if (isset($php_errormsg)) {
-            $conn_error = $php_errormsg;
-        } else {
-            $conn_error = __('Cannot connect: invalid settings.');
-        }
+        $conn_error = __('Cannot connect: invalid settings.');
     }
 
     // Defines the charset to be used
diff --git a/libraries/auth/signon.auth.lib.php b/libraries/auth/signon.auth.lib.php
index a829faa..0a079b2 100644
--- a/libraries/auth/signon.auth.lib.php
+++ b/libraries/auth/signon.auth.lib.php
@@ -238,8 +238,6 @@ function PMA_auth_fails()
             $_SESSION['PMA_single_signon_error_message'] = sprintf(__('No activity within %s seconds; please log in again'), $GLOBALS['cfg']['LoginCookieValidity']);
         } elseif (PMA_DBI_getError()) {
             $_SESSION['PMA_single_signon_error_message'] = PMA_sanitize(PMA_DBI_getError());
-        } elseif (isset($php_errormsg)) {
-            $_SESSION['PMA_single_signon_error_message'] = $php_errormsg;
         } else {
             $_SESSION['PMA_single_signon_error_message'] = __('Cannot log in to the MySQL server');
         }
diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php
index ed8a93a..64ab026 100644
--- a/libraries/dbi/mysql.dbi.lib.php
+++ b/libraries/dbi/mysql.dbi.lib.php
@@ -63,7 +63,7 @@ function PMA_DBI_real_connect($server, $user, $password, $client_flags, $persist
  */
 function PMA_DBI_connect($user, $password, $is_controluser = false, $server = null, $auxiliary_connection = false)
 {
-    global $cfg, $php_errormsg;
+    global $cfg;
 
     if ($server) {
         $server_port = (empty($server['port']))


hooks/post-receive
-- 
phpMyAdmin