From 3910ce61212e44d944ccbd924fd50d69419af548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 26 Jul 2010 16:35:52 +0200 Subject: [PATCH] Remove explicit inclusion of Table.class.php as it is included in common.inc anyway. --- db_operations.php | 1 - db_qbe.php | 2 -- db_structure.php | 3 +-- db_tracking.php | 1 - libraries/database_interface.lib.php | 2 -- libraries/db_table_exists.lib.php | 5 ----- libraries/display_export.lib.php | 5 ----- libraries/display_tbl.lib.php | 1 - libraries/relation.lib.php | 5 ----- libraries/tbl_info.inc.php | 5 ----- sql.php | 1 - tbl_addfield.php | 1 - tbl_alter.php | 1 - tbl_create.php | 1 - tbl_move_copy.php | 1 - tbl_operations.php | 1 - tbl_tracking.php | 1 - view_operations.php | 1 - 18 files changed, 1 insertion(+), 37 deletions(-) diff --git a/db_operations.php b/db_operations.php index 5d4844051..c2464b030 100644 --- a/db_operations.php +++ b/db_operations.php @@ -16,7 +16,6 @@ * requirements */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; require_once './libraries/mysql_charsets.lib.php'; /** diff --git a/db_qbe.php b/db_qbe.php index 5599bad5d..2475065fc 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -10,8 +10,6 @@ * requirements */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; - /** * Gets the relation settings diff --git a/db_structure.php b/db_structure.php index 899fa9515..9e118210b 100644 --- a/db_structure.php +++ b/db_structure.php @@ -9,7 +9,6 @@ * */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; $GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js'; @@ -157,7 +156,7 @@ foreach ($tables as $keyname => $each_table) { $tableReductionCount++; continue; } - + // Get valid statistics whatever is the table type $table_is_view = false; diff --git a/db_tracking.php b/db_tracking.php index 2ff54f0ef..1c8c5cece 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -8,7 +8,6 @@ * Run common work */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; require './libraries/db_common.inc.php'; $url_query .= '&goto=tbl_tracking.php&back=db_tracking.php'; diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 2f24e4fb7..c5b3ca450 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -237,8 +237,6 @@ function PMA_usort_comparison_callback($a, $b) function PMA_DBI_get_tables_full($database, $table = false, $tbl_is_group = false, $link = null, $limit_offset = 0, $limit_count = false, $sort_by = 'Name', $sort_order = 'ASC') { - require_once './libraries/Table.class.php'; - if (true === $limit_count) { $limit_count = $GLOBALS['cfg']['MaxTableList']; } diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php index 1110dc52d..af7599177 100644 --- a/libraries/db_table_exists.lib.php +++ b/libraries/db_table_exists.lib.php @@ -10,11 +10,6 @@ if (! defined('PHPMYADMIN')) { exit; } -/** - * - */ -require_once './libraries/Table.class.php'; - if (empty($is_db)) { if (strlen($db)) { $is_db = @PMA_DBI_select_db($db); diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 5f52d1869..c7952812f 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -8,11 +8,6 @@ if (! defined('PHPMYADMIN')) { exit; } -/** - * - */ -require_once './libraries/Table.class.php'; - // Get relations & co. status $cfgRelation = PMA_getRelationsParam(); diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index a435e3b90..747c5b501 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -9,7 +9,6 @@ /** * */ -require_once './libraries/Table.class.php'; require_once './libraries/Index.class.php'; /** diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index cb8a23e6f..e6ebdc5f9 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -9,11 +9,6 @@ if (! defined('PHPMYADMIN')) { exit; } -/** - * - */ -require_once './libraries/Table.class.php'; - /** * Executes a query as controluser if possible, otherwise as normal user * diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php index e97c2fb7d..00c990413 100644 --- a/libraries/tbl_info.inc.php +++ b/libraries/tbl_info.inc.php @@ -12,11 +12,6 @@ if (! defined('PHPMYADMIN')) { exit; } -/** - * - */ -require_once './libraries/Table.class.php'; - /** * requirements */ diff --git a/sql.php b/sql.php index 28c645810..ed6f7d447 100644 --- a/sql.php +++ b/sql.php @@ -10,7 +10,6 @@ * Gets some core libraries */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; require_once './libraries/check_user_privileges.lib.php'; require_once './libraries/bookmark.lib.php'; diff --git a/tbl_addfield.php b/tbl_addfield.php index e32ba3085..ec910fdf4 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -9,7 +9,6 @@ * Get some core libraries */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; require_once './libraries/header.inc.php'; diff --git a/tbl_alter.php b/tbl_alter.php index d990f0386..4c00acd5e 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -13,7 +13,6 @@ * Gets some core libraries */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; require_once './libraries/header.inc.php'; diff --git a/tbl_create.php b/tbl_create.php index bffc93497..4f6b56f63 100644 --- a/tbl_create.php +++ b/tbl_create.php @@ -34,7 +34,6 @@ * Get some core libraries */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; $action = 'tbl_create.php'; diff --git a/tbl_move_copy.php b/tbl_move_copy.php index fa8a11e4f..9f0e229b4 100644 --- a/tbl_move_copy.php +++ b/tbl_move_copy.php @@ -9,7 +9,6 @@ * Gets some core libraries */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; // Check parameters diff --git a/tbl_operations.php b/tbl_operations.php index 829ed1316..493a17ff4 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -9,7 +9,6 @@ * */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; $pma_table = new PMA_Table($GLOBALS['table'], $GLOBALS['db']); diff --git a/tbl_tracking.php b/tbl_tracking.php index 6ba754310..9b9dbcfe0 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -7,7 +7,6 @@ // Run common work require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; define('TABLE_MAY_BE_ABSENT', true); require './libraries/tbl_common.php'; diff --git a/view_operations.php b/view_operations.php index aabb7d1aa..2149e15eb 100644 --- a/view_operations.php +++ b/view_operations.php @@ -9,7 +9,6 @@ * */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; $pma_table = new PMA_Table($GLOBALS['table'], $GLOBALS['db']);