[Phpmyadmin-devel] patch suggestion for version check problem under https

[Marc Delisle]

Hi,
with the goal of releasing a quick 3.4.1-rc1, I suggest this:

diff --git a/main.php b/main.php
index c7c25bc..4f3b6c3 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);



-- 
Marc Delisle
http://infomarc.info