[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5945-g3910ce6
The branch, master has been updated via 3910ce61212e44d944ccbd924fd50d69419af548 (commit) via 81a4fdf0c9567f981807684a8083e5789b112b07 (commit) via c1f076000be6ce5fa1f72b0a3ae44db69eb110ea (commit) via 2dffa21b0c3679020a23e6e3b6e6fa59fd55a361 (commit) from d291827444206eeaf25399020ad6a3d98a5e2766 (commit)
- Log ----------------------------------------------------------------- commit 3910ce61212e44d944ccbd924fd50d69419af548 Author: Michal Čihař mcihar@novell.com Date: Mon Jul 26 16:35:52 2010 +0200
Remove explicit inclusion of Table.class.php as it is included in common.inc anyway.
commit 81a4fdf0c9567f981807684a8083e5789b112b07 Author: Michal Čihař mcihar@novell.com Date: Mon Jul 26 16:35:24 2010 +0200
No need for require_once for once included code.
commit c1f076000be6ce5fa1f72b0a3ae44db69eb110ea Author: Michal Čihař mcihar@novell.com Date: Mon Jul 26 16:28:56 2010 +0200
No need to require_once here.
commit 2dffa21b0c3679020a23e6e3b6e6fa59fd55a361 Author: Michal Čihař mcihar@novell.com Date: Mon Jul 26 16:28:23 2010 +0200
Loaded by common.
-----------------------------------------------------------------------
Summary of changes: db_operations.php | 1 - db_qbe.php | 2 -- db_structure.php | 3 +-- db_tracking.php | 1 - error.php | 2 +- libraries/Theme_Manager.class.php | 5 ----- libraries/common.inc.php | 22 +++++++++++----------- 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 - 21 files changed, 13 insertions(+), 54 deletions(-)
diff --git a/db_operations.php b/db_operations.php index 5d48440..c2464b0 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 5599bad..2475065 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 899fa95..9e11821 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 2ff54f0..1c8c5ce 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/error.php b/error.php index 040da49..117d070 100644 --- a/error.php +++ b/error.php @@ -9,7 +9,7 @@ /** * Input sanitizing. */ -require_once './libraries/sanitizing.lib.php'; +require './libraries/sanitizing.lib.php';
/* Get variables */ if (! empty($_REQUEST['lang']) && is_string($_REQUEST['lang'])) { diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php index c5298f3..4ca8517 100644 --- a/libraries/Theme_Manager.class.php +++ b/libraries/Theme_Manager.class.php @@ -7,11 +7,6 @@
/** * - */ -require_once './libraries/Theme.class.php'; - -/** - * * @package phpMyAdmin */ class PMA_Theme_Manager diff --git a/libraries/common.inc.php b/libraries/common.inc.php index d1a6d94..80866ff 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -49,7 +49,7 @@ if (!defined('E_DEPRECATED')) { /** * the error handler */ -require_once './libraries/Error_Handler.class.php'; +require './libraries/Error_Handler.class.php';
/** * initialize the error handler @@ -78,42 +78,42 @@ define('PHPMYADMIN', true); /** * core functions */ -require_once './libraries/core.lib.php'; +require './libraries/core.lib.php';
/** * Input sanitizing */ -require_once './libraries/sanitizing.lib.php'; +require './libraries/sanitizing.lib.php';
/** * the PMA_Theme class */ -require_once './libraries/Theme.class.php'; +require './libraries/Theme.class.php';
/** * the PMA_Theme_Manager class */ -require_once './libraries/Theme_Manager.class.php'; +require './libraries/Theme_Manager.class.php';
/** * the PMA_Config class */ -require_once './libraries/Config.class.php'; +require './libraries/Config.class.php';
/** * the relation lib, tracker needs it */ -require_once './libraries/relation.lib.php'; +require './libraries/relation.lib.php';
/** * the PMA_Tracker class */ -require_once './libraries/Tracker.class.php'; +require './libraries/Tracker.class.php';
/** * the PMA_Table class */ -require_once './libraries/Table.class.php'; +require './libraries/Table.class.php';
if (!defined('PMA_MINIMUM_COMMON')) { /** @@ -334,7 +334,7 @@ if ($GLOBALS['PMA_Config']->get('ForceSSL') /** * include session handling after the globals, to prevent overwriting */ -require_once './libraries/session.inc.php'; +require './libraries/session.inc.php';
/** * init some variables LABEL_variables_init @@ -478,7 +478,7 @@ if (! PMA_isValid($_REQUEST['token']) || $_SESSION[' PMA_token '] != $_REQUEST[' /** * Require cleanup functions */ - require_once './libraries/cleanup.lib.php'; + require './libraries/cleanup.lib.php'; /** * Do actual cleanup */ diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 2f24e4f..c5b3ca4 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 1110dc5..af75991 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 5f52d18..c795281 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 a435e3b..747c5b5 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 cb8a23e..e6ebdc5 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -10,11 +10,6 @@ if (! defined('PHPMYADMIN')) { }
/** - * - */ -require_once './libraries/Table.class.php'; - -/** * Executes a query as controluser if possible, otherwise as normal user * * @param string the query to execute diff --git a/libraries/tbl_info.inc.php b/libraries/tbl_info.inc.php index e97c2fb..00c9904 100644 --- a/libraries/tbl_info.inc.php +++ b/libraries/tbl_info.inc.php @@ -13,11 +13,6 @@ if (! defined('PHPMYADMIN')) { }
/** - * - */ -require_once './libraries/Table.class.php'; - -/** * requirements */ require_once './libraries/common.inc.php'; diff --git a/sql.php b/sql.php index 28c6458..ed6f7d4 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 e32ba30..ec910fd 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 d990f03..4c00acd 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 bffc934..4f6b56f 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 fa8a11e..9f0e229 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 829ed13..493a17f 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 6ba7543..9b9dbcf 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 aabb7d1..2149e15 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']);
hooks/post-receive
-
Michal Čihař