fix merge conflicts
This commit is contained in:
@@ -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
|
||||
|
@@ -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";
|
||||
|
Reference in New Issue
Block a user