Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 084c0db

Browse files
author
Marc Delisle
committed
functions.js included automatically
1 parent aec1adb commit 084c0db

23 files changed

Lines changed: 1 addition & 33 deletions

‎chk_rel.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
* Gets some core libraries
1010
*/
1111
require_once './libraries/common.inc.php';
12-
$GLOBALS['js_include'][] = 'functions.js';
1312
require_once './libraries/header.inc.php';
1413
require_once './libraries/relation.lib.php';
1514

‎db_create.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
* Gets some core libraries
1010
*/
1111
require_once './libraries/common.inc.php';
12-
$GLOBALS['js_include'][] = 'functions.js';
1312
require_once './libraries/mysql_charsets.lib.php';
1413

1514
PMA_checkParameters(array('new_db'));

‎export.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
// Does export require to be into file?
6060
if (isset($export_list[$type]['force_file']) && ! $asfile) {
6161
$message = PMA_Message::error(__('Selected export type has to be saved in file!'));
62-
$GLOBALS['js_include'][] = 'functions.js';
6362
require_once './libraries/header.inc.php';
6463
if ($export_type == 'server') {
6564
$active_page = 'server_export.php';
@@ -298,7 +297,6 @@ function PMA_exportOutputHandler($line)
298297
}
299298
}
300299
if (isset($message)) {
301-
$GLOBALS['js_include'][] = 'functions.js';
302300
require_once './libraries/header.inc.php';
303301
if ($export_type == 'server') {
304302
$active_page = 'server_export.php';
@@ -350,7 +348,6 @@ function PMA_exportOutputHandler($line)
350348
$num_tables = count($tables);
351349
if ($num_tables == 0) {
352350
$message = PMA_Message::error(__('No tables found in database.'));
353-
$GLOBALS['js_include'][] = 'functions.js';
354351
require_once './libraries/header.inc.php';
355352
$active_page = 'db_export.php';
356353
require './db_export.php';
@@ -565,7 +562,6 @@ function PMA_exportOutputHandler($line)
565562
// End of fake loop
566563

567564
if ($save_on_server && isset($message)) {
568-
$GLOBALS['js_include'][] = 'functions.js';
569565
require_once './libraries/header.inc.php';
570566
if ($export_type == 'server') {
571567
$active_page = 'server_export.php';
@@ -622,7 +618,6 @@ function PMA_exportOutputHandler($line)
622618
$message = new PMA_Message(__('Dump has been saved to file %s.'), PMA_Message::SUCCESS, $save_filename);
623619
}
624620

625-
$GLOBALS['js_include'][] = 'functions.js';
626621
require_once './libraries/header.inc.php';
627622
if ($export_type == 'server') {
628623
$active_page = 'server_export.php';

‎import.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
*/
1313
require_once './libraries/common.inc.php';
1414
//require_once './libraries/display_import_functions.lib.php';
15-
$GLOBALS['js_include'][] = 'functions.js';
1615

1716
// reset import messages for ajax request
1817
$_SESSION['Import_message']['message'] = null;

‎libraries/db_common.inc.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
unset($db_charset, $db_collation);
6666
}
6767

68-
$GLOBALS['js_include'][] = 'functions.js';
6968
require_once './libraries/header.inc.php';
7069

7170
/**

‎libraries/header_scripts.inc.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
// here, the function does not exist with this configuration: $cfg['ServerDefault'] = 0;
3131
$is_superuser = function_exists('PMA_isSuperuser') && PMA_isSuperuser();
3232

33+
$GLOBALS['js_include'][] = 'functions.js';
3334
$GLOBALS['js_include'][] = 'tooltip.js';
3435
$params = array('lang' => $GLOBALS['lang']);
3536
if (isset($GLOBALS['db'])) {

‎libraries/mult_submits.inc.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@
127127
* Displays the confirmation form if required
128128
*/
129129
if (!empty($submit_mult) && !empty($what)) {
130-
$GLOBALS['js_include'][] = 'functions.js';
131130
unset($message);
132131

133132
require_once './libraries/header.inc.php';

‎libraries/tbl_links.inc.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
/**
3838
* Displays headers
3939
*/
40-
$GLOBALS['js_include'][] = 'functions.js';
4140
require_once './libraries/header.inc.php';
4241

4342
/**

‎querywindow.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@
155155
* prepare JavaScript functionality
156156
*/
157157
$js_include[] = 'common.js';
158-
$js_include[] = 'functions.js';
159158
$js_include[] = 'querywindow.js';
160159

161160
if (PMA_isValid($_REQUEST['auto_commit'], 'identical', 'true')) {

‎server_databases.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
*/
1111
require_once './libraries/common.inc.php';
1212

13-
14-
$GLOBALS['js_include'][] = 'functions.js';
1513
require './libraries/server_common.inc.php';
1614
require './libraries/replication.inc.php';
1715

0 commit comments

Comments
 (0)