[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5244-g01d6fed

[Marc Delisle]

The branch, master has been updated
       via  01d6fed4e2c9594a36d6e688ea26d66946c7b080 (commit)
       via  108f3305e9b1e5950c8bf7bd49d0f41bec2c1154 (commit)
      from  63b6abb326a5795850e9dfeb469873db38bc92a4 (commit)


- Log -----------------------------------------------------------------
commit 01d6fed4e2c9594a36d6e688ea26d66946c7b080
Merge: 63b6abb326a5795850e9dfeb469873db38bc92a4 108f3305e9b1e5950c8bf7bd49d0f41bec2c1154
Author: Marc Delisle <marc at infomarc.info>
Date:   Wed Jun 30 11:37:53 2010 -0400

    fix merge conflicts

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

Summary of changes:
 ChangeLog                        |    1 +
 libraries/header_scripts.inc.php |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f8f0df5..12e1d24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -91,6 +91,7 @@ $Id$
 - bug #3022705 [import] Import button does not work in Catalan when there
   is no progress bar possible
 - bug [replication] Do not offer information_schema in the list of databases
+- bug [js] Avoid loading twice a js file
 
 3.3.4.0 (2010-06-28)
 - bug #2996161 [import] properly escape import value
diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php
index 6a4aacb..cb366b5 100644
--- a/libraries/header_scripts.inc.php
+++ b/libraries/header_scripts.inc.php
@@ -66,6 +66,9 @@ $GLOBALS['js_events'][] = array(
  * upgrade phpMyAdmin are not stuck with older .js files in their
  * browser cache. This produces an HTTP 304 request for each file.
  */
+
+// avoid loading twice a js file
+$GLOBALS['js_include'] = array_unique($GLOBALS['js_include']);
 foreach ($GLOBALS['js_include'] as $js_script_file) {
     if (strpos($js_script_file, '?') === FALSE) {
         echo '<script src="./js/' . $js_script_file . '?ts=' . filemtime('./js/' . $js_script_file) . '" type="text/javascript"></script>' . "\n";


hooks/post-receive
-- 
phpMyAdmin