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

Merge branch 'QA_4_4'

Browse Source
This commit is contained in:
Madhura Jayaratne 2015-05-12 07:24:15 +05:30
commit 286b31c71d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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

2
libraries/common.inc.php
View File

@ -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();