nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

but #1149373, error when blowfish_secret is empty

Browse Source
This commit is contained in:
Marc Delisle
2005-02-23 16:13:24 +00:00
parent 9e39fe6ee6
commit 296c925db6
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $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> 2005-02-23 Alexander M. Turek <me@derrabus.de>
* libraries/grab_globals.lib.php: More hotfixes against bug #1149381. * libraries/grab_globals.lib.php: More hotfixes against bug #1149381.
* libraries/mysql_charsets.lib.php: Detection for new Japanese charsets * libraries/mysql_charsets.lib.php: Detection for new Japanese charsets

5
libraries/auth/cookie.auth.lib.php
View File

@@ -407,6 +407,11 @@ function PMA_auth_check()
global $pma_servername, $pma_username, $pma_password, $old_usr, $server; global $pma_servername, $pma_username, $pma_password, $old_usr, $server;
global $from_cookie; global $from_cookie;
// avoid an error in mcrypt
if ($GLOBALS['cfg']['blowfish_secret']=='') {
return FALSE;
}
// Initialization // Initialization
$PHP_AUTH_USER = $PHP_AUTH_PW = ''; $PHP_AUTH_USER = $PHP_AUTH_PW = '';
$from_cookie = FALSE; $from_cookie = FALSE;