The branch, QA_3_3 has been updated via 108f3305e9b1e5950c8bf7bd49d0f41bec2c1154 (commit) from b2fdf039db1ec34aea802b722bf5ce51b12c1f0b (commit) - Log ----------------------------------------------------------------- commit 108f3305e9b1e5950c8bf7bd49d0f41bec2c1154 Author: Marc Delisle &lt;marc(a)infomarc.info&gt; Date: Wed Jun 30 11:35:46 2010 -0400 bug: avoid loading twice a js file ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/header_scripts.inc.php | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 66873fb..eaa81ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - 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 faf8cc8..0725411 100644 --- a/libraries/header_scripts.inc.php +++ b/libraries/header_scripts.inc.php @@ -112,6 +112,8 @@ $GLOBALS['js_events'][] = array( 'function' => 'PMA_TT_init', ); +// avoid loading twice a js file +$GLOBALS['js_include'] = array_unique($GLOBALS['js_include']); foreach ($GLOBALS['js_include'] as $js_script_file) { echo '<script src="./js/' . $js_script_file . '" type="text/javascript"></script>' . "\n"; } hooks/post-receive -- phpMyAdmin