diff --git a/ChangeLog b/ChangeLog index fadaed9b66..2cf8485c44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,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 diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 0eae80a39a..cfb525639d 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();