Merge remote-tracking branch 'origin/master'

This commit is contained in:
Pootle server 2011-11-23 22:43:13 +01:00
commit 069059de7a
2 changed files with 2 additions and 9 deletions

View File

@ -79,6 +79,7 @@ phpMyAdmin - ChangeLog
- bug #3439292 [core] Fail to synchronize column with name of keyword
- bug #3425156 [interface] Add column after drop
- [interface] Avoid showing the password in phpinfo()'s output
- bug #3441572 [GUI] 'newer version of phpMyAdmin' message not shown in IE8
3.4.7.1 (2011-11-10)
- [security] Fixed possible local file inclusion in XML import

View File

@ -3313,15 +3313,7 @@ $(document).ready(function() {
* Load version information asynchronously.
*/
if ($('.jsversioncheck').length > 0) {
(function() {
var s = document.createElement('script');
s.type = 'text/javascript';
s.async = true;
s.src = 'http://www.phpmyadmin.net/home_page/version.js';
s.onload = PMA_current_version;
var x = document.getElementsByTagName('script')[0];
x.parentNode.insertBefore(s, x);
})();
$.getScript('http://www.phpmyadmin.net/home_page/version.js', PMA_current_version);
}
/**