The branch, master has been updated via ffe3a79301c108b1b7041d98c76429b90f42f708 (commit) via bed8707eea1d20d1d9abda41182389c07a16d190 (commit) via 46245d0c9b20e216a42d6396f03f0bebdbb30f91 (commit) from 6d1468e0c3ff0ab3fc63c4cffdab64ffd8f3dd40 (commit) - Log ----------------------------------------------------------------- commit ffe3a79301c108b1b7041d98c76429b90f42f708 Merge: 6d1468e0c3ff0ab3fc63c4cffdab64ffd8f3dd40 bed8707eea1d20d1d9abda41182389c07a16d190 Author: Marc Delisle <marc@infomarc.info> Date: Tue May 17 07:23:42 2011 -0400 Merge branch 'QA_3_4' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + main.php | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d5d013..0aa84b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,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 diff --git a/main.php b/main.php index d69b4bb..c4c2b2a 100644 --- a/main.php +++ b/main.php @@ -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); hooks/post-receive -- phpMyAdmin