The branch, master has been updated via 084c0dbcf51dea488d99b7bfffffa23832ace4f3 (commit) from aec1adb0e077f2a9521bfa9ed367e9d5b6911042 (commit)
- Log ----------------------------------------------------------------- commit 084c0dbcf51dea488d99b7bfffffa23832ace4f3 Author: Marc Delisle marc@infomarc.info Date: Sat Jul 24 08:11:48 2010 -0400
functions.js included automatically
-----------------------------------------------------------------------
Summary of changes: chk_rel.php | 1 - db_create.php | 1 - export.php | 5 ----- import.php | 1 - libraries/db_common.inc.php | 1 - libraries/header_scripts.inc.php | 1 + libraries/mult_submits.inc.php | 1 - libraries/tbl_links.inc.php | 1 - querywindow.php | 1 - server_databases.php | 2 -- server_export.php | 2 -- server_privileges.php | 1 - server_replication.php | 1 - server_sql.php | 1 - server_synchronize.php | 1 - sql.php | 5 ----- tbl_addfield.php | 1 - tbl_alter.php | 1 - tbl_create.php | 1 - tbl_indexes.php | 1 - tbl_replace.php | 2 -- tbl_row_action.php | 1 - tbl_tracking.php | 1 - 23 files changed, 1 insertions(+), 33 deletions(-)
diff --git a/chk_rel.php b/chk_rel.php index 38ca5c1..323befd 100644 --- a/chk_rel.php +++ b/chk_rel.php @@ -9,7 +9,6 @@ * Gets some core libraries */ require_once './libraries/common.inc.php'; -$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; require_once './libraries/relation.lib.php';
diff --git a/db_create.php b/db_create.php index 9b1959a..50e4cf6 100644 --- a/db_create.php +++ b/db_create.php @@ -9,7 +9,6 @@ * Gets some core libraries */ require_once './libraries/common.inc.php'; -$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/mysql_charsets.lib.php';
PMA_checkParameters(array('new_db')); diff --git a/export.php b/export.php index 2db992d..64ae7d3 100644 --- a/export.php +++ b/export.php @@ -59,7 +59,6 @@ if (empty($_REQUEST['asfile'])) { // Does export require to be into file? if (isset($export_list[$type]['force_file']) && ! $asfile) { $message = PMA_Message::error(__('Selected export type has to be saved in file!')); - $GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; if ($export_type == 'server') { $active_page = 'server_export.php'; @@ -298,7 +297,6 @@ if ($save_on_server) { } } if (isset($message)) { - $GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; if ($export_type == 'server') { $active_page = 'server_export.php'; @@ -350,7 +348,6 @@ if (!$save_on_server) { $num_tables = count($tables); if ($num_tables == 0) { $message = PMA_Message::error(__('No tables found in database.')); - $GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; $active_page = 'db_export.php'; require './db_export.php'; @@ -565,7 +562,6 @@ if (!PMA_exportFooter()) { // End of fake loop
if ($save_on_server && isset($message)) { - $GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; if ($export_type == 'server') { $active_page = 'server_export.php'; @@ -622,7 +618,6 @@ if (!empty($asfile)) { $message = new PMA_Message(__('Dump has been saved to file %s.'), PMA_Message::SUCCESS, $save_filename); }
- $GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; if ($export_type == 'server') { $active_page = 'server_export.php'; diff --git a/import.php b/import.php index b123064..dbc4d56 100644 --- a/import.php +++ b/import.php @@ -12,7 +12,6 @@ */ require_once './libraries/common.inc.php'; //require_once './libraries/display_import_functions.lib.php'; -$GLOBALS['js_include'][] = 'functions.js';
// reset import messages for ajax request $_SESSION['Import_message']['message'] = null; diff --git a/libraries/db_common.inc.php b/libraries/db_common.inc.php index b9a4a97..ea019cb 100644 --- a/libraries/db_common.inc.php +++ b/libraries/db_common.inc.php @@ -65,7 +65,6 @@ if (isset($submitcollation) && !empty($db_collation)) { unset($db_charset, $db_collation); }
-$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php';
/** diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php index a292d0f..8021c34 100644 --- a/libraries/header_scripts.inc.php +++ b/libraries/header_scripts.inc.php @@ -30,6 +30,7 @@ $title = PMA_expandUserString( // here, the function does not exist with this configuration: $cfg['ServerDefault'] = 0; $is_superuser = function_exists('PMA_isSuperuser') && PMA_isSuperuser();
+$GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'tooltip.js'; $params = array('lang' => $GLOBALS['lang']); if (isset($GLOBALS['db'])) { diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 0b3413b..2fab680 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -127,7 +127,6 @@ if (! empty($submit_mult) * Displays the confirmation form if required */ if (!empty($submit_mult) && !empty($what)) { - $GLOBALS['js_include'][] = 'functions.js'; unset($message);
require_once './libraries/header.inc.php'; diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php index 1f695a5..ef61293 100644 --- a/libraries/tbl_links.inc.php +++ b/libraries/tbl_links.inc.php @@ -37,7 +37,6 @@ $err_url = $cfg['DefaultTabTable'] . PMA_generate_common_url($url_params); /** * Displays headers */ -$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php';
/** diff --git a/querywindow.php b/querywindow.php index 7b2b08d..84b0e82 100644 --- a/querywindow.php +++ b/querywindow.php @@ -155,7 +155,6 @@ $sql_query = ''; * prepare JavaScript functionality */ $js_include[] = 'common.js'; -$js_include[] = 'functions.js'; $js_include[] = 'querywindow.js';
if (PMA_isValid($_REQUEST['auto_commit'], 'identical', 'true')) { diff --git a/server_databases.php b/server_databases.php index 0c7d598..16b2cdc 100644 --- a/server_databases.php +++ b/server_databases.php @@ -10,8 +10,6 @@ */ require_once './libraries/common.inc.php';
- -$GLOBALS['js_include'][] = 'functions.js'; require './libraries/server_common.inc.php'; require './libraries/replication.inc.php';
diff --git a/server_export.php b/server_export.php index 9d78ce7..f9808d8 100644 --- a/server_export.php +++ b/server_export.php @@ -10,8 +10,6 @@ */ require_once './libraries/common.inc.php';
-$GLOBALS['js_include'][] = 'functions.js'; - /** * Displays the links */ diff --git a/server_privileges.php b/server_privileges.php index a909ef5..bd2ddb3 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -14,7 +14,6 @@ require_once './libraries/common.inc.php'; * Does the common work */ $GLOBALS['js_include'][] = 'server_privileges.js'; -$GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'password_generation.js'; require './libraries/server_common.inc.php';
diff --git a/server_replication.php b/server_replication.php index 1dbd42e..9ac1816 100644 --- a/server_replication.php +++ b/server_replication.php @@ -14,7 +14,6 @@ require_once './libraries/common.inc.php'; * Does the common work */ $GLOBALS['js_include'][] = 'server_privileges.js'; -$GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'replication.js';
require './libraries/server_common.inc.php'; diff --git a/server_sql.php b/server_sql.php index 1b8027c..73c1379 100644 --- a/server_sql.php +++ b/server_sql.php @@ -13,7 +13,6 @@ require_once './libraries/common.inc.php'; /** * Does the common work */ -$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/server_common.inc.php'; require_once './libraries/sql_query_form.lib.php';
diff --git a/server_synchronize.php b/server_synchronize.php index 1272dda..6f0941b 100644 --- a/server_synchronize.php +++ b/server_synchronize.php @@ -14,7 +14,6 @@ require_once './libraries/common.inc.php'; /** * Does the common work */ -$GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'server_synchronize.js'; require_once './libraries/server_common.inc.php';
diff --git a/sql.php b/sql.php index c4ae9ff..9175532 100644 --- a/sql.php +++ b/sql.php @@ -545,10 +545,6 @@ if (0 == $num_rows || $is_affected) { $goto = 'main.php'; } // Loads to target script - if (strpos($goto, 'db_') === 0 - || strpos($goto, 'tbl_') === 0) { - $GLOBALS['js_include'][] = 'functions.js'; - } if ($goto != 'main.php') { require_once './libraries/header.inc.php'; } @@ -573,7 +569,6 @@ else { if (isset($printview) && $printview == '1') { require_once './libraries/header_printview.inc.php'; } else { - $GLOBALS['js_include'][] = 'functions.js'; unset($message); if (strlen($table)) { require './libraries/tbl_common.php'; diff --git a/tbl_addfield.php b/tbl_addfield.php index b61327f..6d6c14a 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -11,7 +11,6 @@ require_once './libraries/common.inc.php'; require_once './libraries/Table.class.php';
-$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php';
// Check parameters diff --git a/tbl_alter.php b/tbl_alter.php index 7f81c41..423156e 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -15,7 +15,6 @@ require_once './libraries/common.inc.php'; require_once './libraries/Table.class.php';
-$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php';
// Check parameters diff --git a/tbl_create.php b/tbl_create.php index 8f77bb3..fc1119b 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -36,7 +36,6 @@ require_once './libraries/common.inc.php'; require_once './libraries/Table.class.php';
-$GLOBALS['js_include'][] = 'functions.js'; $action = 'tbl_create.php';
require_once './libraries/header.inc.php'; diff --git a/tbl_indexes.php b/tbl_indexes.php index 172191a..eb6deb9 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -111,7 +111,6 @@ if (isset($_REQUEST['do_save_data'])) { */
// Displays headers (if needed) -$GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'indexes.js';
require_once './libraries/tbl_info.inc.php'; diff --git a/tbl_replace.php b/tbl_replace.php index bcf64af..92331b9 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -328,7 +328,6 @@ if ($is_insert && count($value_sets) > 0) { } elseif (empty($query)) { // No change -> move back to the calling script $message = PMA_Message::success(__('No change')); - $GLOBALS['js_include'][] = 'functions.js'; $active_page = $goto_include; require_once './libraries/header.inc.php'; require './' . PMA_securePath($goto_include); @@ -428,7 +427,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-ui-1.8.custom.js';
diff --git a/tbl_row_action.php b/tbl_row_action.php index 356ad57..62fc204 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -71,7 +71,6 @@ switch($submit_mult) { }
$GLOBALS['js_include'][] = 'tbl_change.js'; -$GLOBALS['js_include'][] = 'functions.js';
require_once './libraries/header.inc.php';
diff --git a/tbl_tracking.php b/tbl_tracking.php index 698076a..6312262 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -233,7 +233,6 @@ if (isset($_REQUEST['report_export']) && $_REQUEST['export_type'] == 'sqldump') $table_temp = $table;
$db = $table = ''; - $GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/sql_query_form.lib.php';
PMA_sqlQueryForm($new_query, 'sql');
hooks/post-receive