The branch, MAINT_3_4_1 has been updated via 46245d0c9b20e216a42d6396f03f0bebdbb30f91 (commit) from 3b9333baddaa1957f8feabc2515accdcc45964e8 (commit)

- Log ----------------------------------------------------------------- -----------------------------------------------------------------------

Summary of changes: ChangeLog | 1 + main.php | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 2d779a7..99d7444 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/main.php b/main.php index c7c25bc..836a250 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