From 47b734473e964546c5ac6f5324324f8ebf7fc3d4 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 11 May 2015 11:29:45 +0530 Subject: [PATCH 1/2] bug #4512 ForceSSL Redirect Check Signed-off-by: Madhura Jayaratne --- libraries/common.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 2de8594024..6e9d7a1a92 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -331,7 +331,7 @@ if (isset($_COOKIE) * check HTTPS connection */ if ($GLOBALS['PMA_Config']->get('ForceSSL') - && ! $GLOBALS['PMA_Config']->get('is_https') + && ! $GLOBALS['PMA_Config']->detectHttps() ) { // grab SSL URL $url = $GLOBALS['PMA_Config']->getSSLUri(); From 9cb7f30ee8f8f92444df7ae3c70ae04c00adc332 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 12 May 2015 07:22:19 +0530 Subject: [PATCH 2/2] ChangeLog entry for bug #4512 Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 7bdb0a5f22..bef6f66fe3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ phpMyAdmin - ChangeLog - bug #4898 JS error after selecting a field and press Enter - bug Honor proxy settings when getting Git commit information - bug Missing title on link +- bug #4512 ForceSSL Redirect Check 4.4.6.0 (2015-05-07) - bug #4890 webkitStorageInfo and webkitIndexedDB is deprecated