diff options
author | Michal Čihař <mcihar@suse.cz> | 2012-04-16 16:14:40 +0400 |
---|---|---|
committer | Michal Čihař <mcihar@suse.cz> | 2012-04-16 16:15:26 +0400 |
commit | c55477e97a0f482172c1e3687cf964be4a6caf7e (patch) | |
tree | 1d5a35f7687ccfbd4f76f2ff4f5fbc02c12f31b9 /main.php | |
parent | 30197b8fc3ecca32ed1f5cf9cfb40a74f8708932 (diff) |
Disable version check only for IE as it does not support CSP
Diffstat (limited to 'main.php')
-rw-r--r-- | main.php | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -236,10 +236,9 @@ echo '<div class="group pmagroup">'; echo '<h2>phpMyAdmin</h2>'; echo '<ul>'; $class = null; -// 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')) { +// We rely on CSP to allow access to http://www.phpmyadmin.net, but IE lacks +// support here and does not allow request to http once using https. +if ($GLOBALS['cfg']['VersionCheck'] && (! $GLOBALS['PMA_Config']->get('is_https') || PMA_USR_BROWSER_AGENT != 'IE')) { $class = 'jsversioncheck'; } PMA_printListItem(__('Version information') . ': ' . PMA_VERSION, 'li_pma_version', null, null, null, null, $class); |