diff options
| author | Michal Čihař <michal@cihar.com> | 2010-01-21 14:18:18 +0300 |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2010-01-21 14:18:18 +0300 |
| commit | 94c2f864ae1dbe9efcf408e64b051621e7335643 (patch) | |
| tree | 2755353b411881b4249f6e0c43d777aee0776906 /user_password.php | |
| parent | f7dda75cd7b262d826a9f7aee7a0e458b5ccc5d3 (diff) | |
[core] Remove config data from session as it brings chicken-egg problem.
Configuration data stores PmaAbsoluteUri, which should be accessible
before initiating session. Otherwise there is no way to make
PmaAbsoluteUri work. PmaAbsoluteUri is needed at least for reverse
proxy setups, for example http webserver running behind https proxy.
Diffstat (limited to 'user_password.php')
| -rw-r--r-- | user_password.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/user_password.php b/user_password.php index 787c7fba8c..f4141854ba 100644 --- a/user_password.php +++ b/user_password.php @@ -21,7 +21,7 @@ * @uses PMA_generate_common_url() * @uses PMA_isValid() * @uses PMA_mysqlDie() - * @uses PMA_setCookie() + * @uses $GLOBALS['PMA_Config']->setCookie() * @uses PMA_blowfish_encrypt() * @uses PMA_showMessage() * @uses define() @@ -96,7 +96,7 @@ if (isset($_REQUEST['nopass'])) { // Changes password cookie if required // Duration = till the browser is closed for password (we don't want this to be saved) if ($cfg['Server']['auth_type'] == 'cookie') { - PMA_setCookie('pmaPass-' . $server, + $GLOBALS['PMA_Config']->setCookie('pmaPass-' . $server, PMA_blowfish_encrypt($password, $GLOBALS['cfg']['blowfish_secret'])); } // end if |