From aa452ef9d64dad7f3c4dd6b1e6cf78adb37b9d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Sun, 25 Aug 2019 19:56:11 -0300 Subject: [PATCH] Declare globals in some entry points MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maurício Meneghini Fauth --- libraries/entry_points/server/export.php | 2 +- libraries/entry_points/server/privileges.php | 15 ++++++++++++++- libraries/entry_points/table/addfield.php | 2 +- libraries/entry_points/table/create.php | 2 +- libraries/entry_points/table/export.php | 4 ++-- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/libraries/entry_points/server/export.php b/libraries/entry_points/server/export.php index 02ddf6eff58e..c6ddb7b44cac 100644 --- a/libraries/entry_points/server/export.php +++ b/libraries/entry_points/server/export.php @@ -15,7 +15,7 @@ exit; } -global $db, $table, $sql_query, $num_tables, $unlim_num_rows; +global $db, $table, $sql_query, $num_tables, $unlim_num_rows, $tmp_select, $select_item, $multi_values; require_once ROOT_PATH . 'libraries/server_common.inc.php'; diff --git a/libraries/entry_points/server/privileges.php b/libraries/entry_points/server/privileges.php index ca932bbe70f6..5741781d66eb 100644 --- a/libraries/entry_points/server/privileges.php +++ b/libraries/entry_points/server/privileges.php @@ -23,7 +23,20 @@ exit; } -global $containerBuilder, $db, $err_url, $message, $pmaThemeImage, $text_dir, $url_query; +global $containerBuilder, $db, $err_url, $message, $pmaThemeImage, $text_dir, $url_query, $post_patterns; +global $username, $hostname, $dbname, $tablename, $routinename, $db_and_table, $dbname_is_wildcard; +global $queries, $password, $ret_message, $ret_queries, $queries_for_display, $sql_query, $_add_user_error; +global $itemType, $tables, $num_tables, $total_num_tables, $sub_part, $is_show_stats, $db_is_system_schema; +global $tooltip_truename, $tooltip_aliasname, $pos, $title, $export, $grants, $one_grant, $url_dbname; +global $strPrivDescAllPrivileges, $strPrivDescAlter, $strPrivDescAlterRoutine, $strPrivDescCreateDb, + $strPrivDescCreateRoutine, $strPrivDescCreateTbl, $strPrivDescCreateTmpTable, $strPrivDescCreateUser, + $strPrivDescCreateView, $strPrivDescDelete, $strPrivDescDeleteHistoricalRows, $strPrivDescDropDb, + $strPrivDescDropTbl, $strPrivDescEvent, $strPrivDescExecute, $strPrivDescFile, + $strPrivDescGrantTbl, $strPrivDescIndex, $strPrivDescInsert, $strPrivDescLockTables, + $strPrivDescMaxConnections, $strPrivDescMaxQuestions, $strPrivDescMaxUpdates, $strPrivDescMaxUserConnections, + $strPrivDescProcess, $strPrivDescReferences, $strPrivDescReload, $strPrivDescReplClient, + $strPrivDescReplSlave, $strPrivDescSelect, $strPrivDescShowDb, $strPrivDescShowView, + $strPrivDescShutdown, $strPrivDescSuper, $strPrivDescTrigger, $strPrivDescUpdate, $strPrivDescUsage; /** @var Response $response */ $response = $containerBuilder->get(Response::class); diff --git a/libraries/entry_points/table/addfield.php b/libraries/entry_points/table/addfield.php index 04edd0f02892..b37cf1962b66 100644 --- a/libraries/entry_points/table/addfield.php +++ b/libraries/entry_points/table/addfield.php @@ -21,7 +21,7 @@ } global $containerBuilder, $err_url, $message, $action, $active_page, $num_fields, $sql_query; -global $abort, $num_fields, $regenerate, $result; +global $abort, $num_fields, $regenerate, $result, $db, $table; /** @var Response $response */ $response = $containerBuilder->get(Response::class); diff --git a/libraries/entry_points/table/create.php b/libraries/entry_points/table/create.php index cdba8e0b5c33..122532eeb01a 100644 --- a/libraries/entry_points/table/create.php +++ b/libraries/entry_points/table/create.php @@ -20,7 +20,7 @@ exit; } -global $containerBuilder, $num_fields, $action, $sql_query, $result; +global $containerBuilder, $num_fields, $action, $sql_query, $result, $db, $table; /** @var Response $response */ $response = $containerBuilder->get(Response::class); diff --git a/libraries/entry_points/table/export.php b/libraries/entry_points/table/export.php index 65569ecaffd0..e83405af7dcf 100644 --- a/libraries/entry_points/table/export.php +++ b/libraries/entry_points/table/export.php @@ -18,8 +18,8 @@ exit; } -global $containerBuilder, $db, $url_query, $url_params, $table; -global $sql_query, $where_clause, $num_tables, $unlim_num_rows, $multi_values; +global $containerBuilder, $db, $url_query, $url_params, $table, $export_page_title, $replaces; +global $sql_query, $where_clause, $num_tables, $unlim_num_rows, $multi_values, $aliases; /** @var Response $response */ $response = $containerBuilder->get(Response::class);