[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7_1-23280-g4dda62d

Rouslan Placella roccivic at users.sourceforge.net
Wed Nov 23 22:42:00 CET 2011


The branch, master has been updated
       via  4dda62da8978f43d580ab6295326831813b6c674 (commit)
       via  035c112eafeb57201c63f0b94d7485d41762922f (commit)
      from  a6dc747df1404a0029f8d1f60c22a6549cdd94ef (commit)


- Log -----------------------------------------------------------------
commit 4dda62da8978f43d580ab6295326831813b6c674
Merge: a6dc747 035c112
Author: Rouslan Placella <rouslan at placella.com>
Date:   Wed Nov 23 21:40:52 2011 +0000

    Merge branch 'QA_3_4'

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog       |    1 +
 js/functions.js |   10 +---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7cbd315..ec37459 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/js/functions.js b/js/functions.js
index f921f95..4cdc10b 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -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);
     }
 
     /**


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list