From 296c925db67a4d106721e06b5f2feeea4829fe9a Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Wed, 23 Feb 2005 16:13:24 +0000
Subject: [PATCH] but #1149373, error when blowfish_secret is empty

---
 ChangeLog                          | 4 ++++
 libraries/auth/cookie.auth.lib.php | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 319c93030..47a78473f 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-02-23 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/auth/cookie.auth.lib.php: bug #1149373, error when
+      blowfish_secret is empty
+
 2005-02-23 Alexander M. Turek  <me@derrabus.de>
     * libraries/grab_globals.lib.php: More hotfixes against bug #1149381.
     * libraries/mysql_charsets.lib.php: Detection for new Japanese charsets
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index 8aac9fd7c..e3d3ed098 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -407,6 +407,11 @@ function PMA_auth_check()
     global $pma_servername, $pma_username, $pma_password, $old_usr, $server;
     global $from_cookie;
 
+    // avoid an error in mcrypt
+    if ($GLOBALS['cfg']['blowfish_secret']=='') {
+        return FALSE;
+    }
+
     // Initialization
     $PHP_AUTH_USER = $PHP_AUTH_PW = '';
     $from_cookie   = FALSE;