Avoid multiple loading of jQuery.

db_structure.php

@@ -12,7 +12,6 @@
 require_once './libraries/common.inc.php';
 require_once './libraries/Table.class.php';
 
-$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js';
 $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.min.js';
 
 /**
@@ -195,7 +194,7 @@ foreach ($tables as $keyname => $each_table) {
                 $each_table['Rows'] = PMA_Table::countRecords($db,
                     $each_table['Name']);
             }
-                
+
             if ($is_show_stats) {
                 $tblsize                    =  doubleval($each_table['Data_length']) + doubleval($each_table['Index_length']);
                 $sum_size                   += $tblsize;
@@ -348,15 +347,15 @@ foreach ($tables as $keyname => $each_table) {
         <?php
         PMA_TableHeader(false, $server_slave_status);
     }
-    
+
     $ignored = false;
     $do = false;
-    
+
     if ($server_slave_status) {
         ////////////////////////////////////////////////////////////////
 
-        if ((strlen(array_search($truename, $server_slave_Do_Table)) > 0) 
+        if ((strlen(array_search($truename, $server_slave_Do_Table)) > 0)
-            || (strlen(array_search($db, $server_slave_Do_DB)) > 0) 
+            || (strlen(array_search($db, $server_slave_Do_DB)) > 0)
             || (count($server_slave_Do_DB) == 1 && count($server_slave_Ignore_DB) == 1)
         ) {
             $do = true;

main.php

@@ -12,7 +12,6 @@
 define('PMA_COLORPICKER', true);
 require_once './libraries/common.inc.php';
 
-$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js';
 $GLOBALS['js_include'][] = 'colorpicker/js/colorpicker.js';
 $GLOBALS['js_include'][] = 'main_custom_color.js';
 

sql.php

@@ -15,7 +15,6 @@ require_once './libraries/Table.class.php';
 require_once './libraries/check_user_privileges.lib.php';
 require_once './libraries/bookmark.lib.php';
 
-$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js';
 $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.min.js';
 
 /**
@@ -296,7 +295,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
     }
 
     // fisharebest: release the session lock, otherwise we won't be able to run other
-    // scripts until the query has finished (which could take a very long time). 
+    // scripts until the query has finished (which could take a very long time).
     // Note: footer.inc.php writes debug info to $_SESSION, so debuggers will have to wait.
     if (empty($_SESSION['debug'])) {
         session_write_close();
@@ -388,7 +387,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
 
         // If we are "just browsing", there is only one table,
         // and no WHERE clause (or just 'WHERE 1 '),
-        // we do a quick count (which uses MaxExactCount) because 
+        // we do a quick count (which uses MaxExactCount) because
         // SQL_CALC_FOUND_ROWS is not quick on large InnoDB tables
 
         // However, do not count again if we did it previously

tbl_replace.php

@@ -96,7 +96,7 @@ if (isset($_REQUEST['after_insert'])
                 // must find a unique condition based on unique key,
                 // not a combination of all fields
                 list($unique_condition, $clause_is_unique) = PMA_getUniqueCondition($res, count($meta), $meta, $row, true);
-                if (! empty($unique_condition)) { 
+                if (! empty($unique_condition)) {
                     $_SESSION['edit_next'] = $unique_condition;
                 }
                 unset($unique_condition, $clause_is_unique);
@@ -346,7 +346,7 @@ if (! empty($GLOBALS['sql_query'])) {
     $return_to_sql_query = $GLOBALS['sql_query'];
 }
 $GLOBALS['sql_query'] = implode('; ', $query) . ';';
-// to ensure that the query is displayed in case of 
+// to ensure that the query is displayed in case of
 // "insert as new row" and then "insert another new row"
 $GLOBALS['display_query'] = $GLOBALS['sql_query'];
 
@@ -431,7 +431,6 @@ if (isset($return_to_sql_query)) {
 $GLOBALS['js_include'][] = 'tbl_change.js';
 $GLOBALS['js_include'][] = 'functions.js';
 // in case we call sql.php which needs those:
-$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js';
 $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.min.js';
 
 $active_page = $goto_include;

tbl_select.php

@@ -19,7 +19,6 @@ require_once './libraries/relation.lib.php'; // foreign keys
 require_once './libraries/mysql_charsets.lib.php';
 
 $GLOBALS['js_include'][] = 'tbl_change.js';
-$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js';
 $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.min.js';
 
 if ($GLOBALS['cfg']['PropertiesIconic'] == true) {
@@ -341,8 +340,8 @@ else {
         $param = PMA_backquote($param);
         $sql_query .= implode(', ', $param);
     } // end if
-     
+
-    // avoid a loop, for example when $cfg['DefaultTabTable'] is set 
+    // avoid a loop, for example when $cfg['DefaultTabTable'] is set
     // to 'tbl_select.php'
     unset($param);
 

tbl_structure.php

@@ -14,7 +14,6 @@ require_once './libraries/common.inc.php';
 require_once './libraries/mysql_charsets.lib.php';
 require_once './libraries/relation.lib.php';
 
-$GLOBALS['js_include'][] = 'jquery/jquery-1.4.2-min.js';
 $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.min.js';
 
 /**
@@ -117,7 +116,7 @@ foreach (PMA_Index::getFromTable($table, $db) as $index) {
         $columns = $index->getColumns();
         foreach ($columns as $column_name => $dummy) {
             $columns_with_unique_index[$column_name] = 1;
-        } 
+        }
     }
 }
 unset($index, $columns, $column_name, $dummy);
@@ -519,20 +518,20 @@ if (! $tbl_is_view && ! $db_is_information_schema) {
     echo $strStructPropose;
     ?></a><?php
     echo PMA_showMySQLDocu('Extending_MySQL', 'procedure_analyse') . "\n";
-    
+
-    
+
     if(PMA_Tracker::isActive())
     {
         echo '<a href="tbl_tracking.php?' . $url_query . '">';
-        
+
-        if ($cfg['PropertiesIconic']) 
+        if ($cfg['PropertiesIconic'])
         {
             echo '<img class="icon" src="' . $pmaThemeImage . 'eye.png" width="16" height="16" alt="' . $strTrackingTrackTable . '" /> ';
         }
         echo $strTrackingTrackTable . '</a>';
     }
     ?>
-    
+
     <br />
 <form method="post" action="tbl_addfield.php"
     onsubmit="return checkFormElementInRange(this, 'num_fields', '<?php echo str_replace('\'', '\\\'', $GLOBALS['strInvalidFieldAddCount']); ?>', 1)">