bug #3302733 [core] Some browsers report an insecure https connection

This commit is contained in:
Marc Delisle
2011-05-17 07:22:56 -04:00
parent 3b9333badd
commit 46245d0c9b
2 changed files with 5 additions and 1 deletions

View File

@@ -8,6 +8,7 @@
- bug #3300981 [navi] Table filter is case sensitive
- bug #3285929 [privileges] Revert temporary fix
- bug #3302872 [synchronize] Synchronize and user name
- bug #3302733 [core] Some browsers report an insecure https connection
3.4.0.0 (2011-05-11)
+ rfe #2890226 [view] Enable VIEW rename

View File

@@ -202,7 +202,10 @@ echo '<div class="group pmagroup">';
echo '<h2>phpMyAdmin</h2>';
echo '<ul>';
$class = null;
if ($GLOBALS['cfg']['VersionCheck']) {
// workaround for bug 3302733; some browsers don't like the situation
// where phpMyAdmin is called on a secure page but a part of the page
// (the version check) refers to a non-secure page
if ($GLOBALS['cfg']['VersionCheck'] && ! $GLOBALS['PMA_Config']->get('is_https')) {
$class = 'jsversioncheck';
}
PMA_printListItem(__('Version information') . ': ' . PMA_VERSION, 'li_pma_version', null, null, null, null, $class);