Skip to content
Permalink
Browse files Browse the repository at this point in the history
Load JSON rather than javascript from phpmyadmin.net
Conflicts:
	js/functions.js
	libraries/Header.class.php
  • Loading branch information
nijel committed Sep 3, 2012
1 parent ceaee44 commit 50edafc
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions js/functions.js
Expand Up @@ -128,13 +128,13 @@ function parseVersionString (str)
/**
* Indicates current available version on main page.
*/
function PMA_current_version()
function PMA_current_version(data)
{
var current = parseVersionString(pmaversion);
var latest = parseVersionString(PMA_latest_version);
var version_information_message = PMA_messages['strLatestAvailable'] + ' ' + PMA_latest_version;
var latest = parseVersionString(data['version']);
var version_information_message = PMA_messages['strLatestAvailable'] + ' ' + data['version'];
if (latest > current) {
var message = $.sprintf(PMA_messages['strNewerVersion'], PMA_latest_version, PMA_latest_date);
var message = $.sprintf(PMA_messages['strNewerVersion'], data['version'], data['date']);
if (Math.floor(latest / 10000) == Math.floor(current / 10000)) {
/* Security update */
klass = 'error';
Expand Down Expand Up @@ -1734,7 +1734,7 @@ function PMA_createProfilingChartJqplot(target, data)
seriesDefaults: {
renderer: $.jqplot.PieRenderer,
rendererOptions: {
showDataLabels: true
showDataLabels: true
}
},
legend: {
Expand Down Expand Up @@ -3218,7 +3218,7 @@ $(document).ready(function() {
* Load version information asynchronously.
*/
if ($('.jsversioncheck').length > 0) {
$.getScript('http://www.phpmyadmin.net/home_page/version.js', PMA_current_version);
$.getJSON('http://www.phpmyadmin.net/home_page/version.json', {}, PMA_current_version);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion libraries/header_http.inc.php
Expand Up @@ -22,7 +22,7 @@
/* Prevent against ClickJacking by allowing frames only from same origin */
if (!$GLOBALS['cfg']['AllowThirdPartyFraming']) {
header('X-Frame-Options: SAMEORIGIN');
header("X-Content-Security-Policy: allow 'self'; options inline-script eval-script; frame-ancestors 'self'; img-src 'self' data:; script-src 'self' http://www.phpmyadmin.net");
header("X-Content-Security-Policy: allow 'self' http://www.phpmyadmin.net; options inline-script eval-script; frame-ancestors 'self'; img-src 'self' data:");
header("X-WebKit-CSP: allow 'self' http://www.phpmyadmin.net; options inline-script eval-script");
}
PMA_no_cache_header();
Expand Down

1 comment on commit 50edafc

@andisusilo2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks very much nijel

Please sign in to comment.