diff options
| author | Madhura Jayaratne <madhura.cj@gmail.com> | 2015-05-15 04:49:13 +0300 |
|---|---|---|
| committer | Madhura Jayaratne <madhura.cj@gmail.com> | 2015-05-15 04:49:13 +0300 |
| commit | b2a3d6cfb2a33cf66bba2635f810c99f11ccf9bd (patch) | |
| tree | c1e11105f876c03da94416c44b298b5b38811c6a | |
| parent | f6a00c4eb3a8801693aef28088ed77039434e1aa (diff) | |
| parent | 1257f2c7144b70065d01f08c496a5266b57226e3 (diff) | |
Merge branch 'QA_4_4'
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | setup/config.php | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -50,6 +50,7 @@ phpMyAdmin - ChangeLog - bug Invalid value for CURLOPT_SSL_VERIFYPEER - bug #4367 Import status infinite loop - bug #4902 Designer: Loading does not work +- bug #4904 Setup: Overview > Display does not work 4.4.6.1 (2015-05-13) - bug #4899 [security] CSRF vulnerability in setup diff --git a/setup/config.php b/setup/config.php index ffe65915ed..4e09780f63 100644 --- a/setup/config.php +++ b/setup/config.php @@ -50,7 +50,7 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) { ConfigGenerator::getConfigFile($GLOBALS['ConfigFile']) ); header('HTTP/1.1 303 See Other'); - header('Location: index.php?action_done=config_saved'); + header('Location: index.php' . PMA_URL_getCommon() . '&action_done=config_saved'); exit; } elseif (PMA_ifSetOr($_POST['submit_load'], '')) { // @@ -75,7 +75,7 @@ if (PMA_ifSetOr($_POST['submit_clear'], '')) { // Show generated config file in a <textarea> // header('HTTP/1.1 303 See Other'); - header('Location: index.php?page=config'); + header('Location: index.php' . PMA_URL_getCommon() . '&page=config'); exit; } ?> |