diff --git a/ChangeLog b/ChangeLog index 0ba08c1d5..49209a08b 100755 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,10 @@ $Source$ * tbl_rename.php: removed, deprecated by function PMA_table_rename() * db_search.php, libraries/common.lib.php, libraries/tbl_move_copy.php, pdf_schema.php: removed PMA_isInto(), deprecated by in_array() + * libraries\mult_submits.inc.php, sql.php, tbl_addfield.php, tbl_alter.php, + tbl_import.php, tbl_properties.php, tbl_properties_structure.php, + tbl_properties_operations.php, tbl_properties_export.php, tbl_select.php + tbl_relation.php: moved tbl_properties_common.php into libraries 2005-12-07 Michal Čihař * lang/*: Unused messages cleanup, add missing ones. diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 93ac3d58c..aa31bf089 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -127,7 +127,7 @@ if ( !empty($submit_mult) && !empty($what)) { $js_to_run = 'functions.js'; unset($message); if (!empty($table)) { - require('./tbl_properties_common.php'); + require('./libraries/tbl_properties_common.php'); $url_query .= '&goto=tbl_properties.php&back=tbl_properties.php'; require('./libraries/tbl_properties_table_info.inc.php'); } diff --git a/tbl_properties_common.php b/libraries/tbl_properties_common.php similarity index 100% rename from tbl_properties_common.php rename to libraries/tbl_properties_common.php diff --git a/sql.php b/sql.php index 7d0a5a813..fa1cfc20c 100644 --- a/sql.php +++ b/sql.php @@ -695,7 +695,7 @@ else { $js_to_run = 'functions.js'; unset($message); if (!empty($table)) { - require('./tbl_properties_common.php'); + require('./libraries/tbl_properties_common.php'); $url_query .= '&goto=tbl_properties.php&back=tbl_properties.php'; require('./libraries/tbl_properties_table_info.inc.php'); require('./libraries/tbl_properties_links.inc.php'); diff --git a/tbl_addfield.php b/tbl_addfield.php index 04aae32ac..80d606dfe 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -211,7 +211,7 @@ if ($abort == FALSE) { /** * Gets tables informations */ - require_once('./tbl_properties_common.php'); + require_once('./libraries/tbl_properties_common.php'); require_once('./libraries/tbl_properties_table_info.inc.php'); /** * Displays top menu links diff --git a/tbl_alter.php b/tbl_alter.php index 10165377d..fc3f36f27 100644 --- a/tbl_alter.php +++ b/tbl_alter.php @@ -16,7 +16,7 @@ PMA_checkParameters(array('db', 'table')); /** * Gets tables informations */ -require_once('./tbl_properties_common.php'); +require_once('./libraries/tbl_properties_common.php'); require_once('./libraries/tbl_properties_table_info.inc.php'); /** * Displays top menu links diff --git a/tbl_import.php b/tbl_import.php index 267561abb..bd4558243 100644 --- a/tbl_import.php +++ b/tbl_import.php @@ -7,7 +7,7 @@ require_once('./libraries/common.lib.php'); /** * Gets tables informations and displays top links */ -require_once('./tbl_properties_common.php'); +require_once('./libraries/tbl_properties_common.php'); require_once('./libraries/tbl_properties_table_info.inc.php'); /** * Displays top menu links diff --git a/tbl_properties.php b/tbl_properties.php index 502d553ed..119ed297a 100644 --- a/tbl_properties.php +++ b/tbl_properties.php @@ -7,7 +7,7 @@ require_once('./libraries/common.lib.php'); /** * Runs common work */ -require('./tbl_properties_common.php'); +require('./libraries/tbl_properties_common.php'); require_once('./libraries/sql_query_form.lib.php'); $err_url = 'tbl_properties.php' . $err_url; diff --git a/tbl_properties_export.php b/tbl_properties_export.php index 54191dddb..8e2a54eea 100644 --- a/tbl_properties_export.php +++ b/tbl_properties_export.php @@ -7,7 +7,7 @@ require_once('./libraries/common.lib.php'); /** * Gets tables informations and displays top links */ -require_once('./tbl_properties_common.php'); +require_once('./libraries/tbl_properties_common.php'); $url_query .= '&goto=tbl_properties_export.php&back=tbl_properties_export.php'; require_once('./libraries/tbl_properties_table_info.inc.php'); ?> diff --git a/tbl_properties_operations.php b/tbl_properties_operations.php index 048bad03d..308267da6 100644 --- a/tbl_properties_operations.php +++ b/tbl_properties_operations.php @@ -7,7 +7,7 @@ require_once('./libraries/common.lib.php'); /** * Runs common work */ -require('./tbl_properties_common.php'); +require('./libraries/tbl_properties_common.php'); /** * Gets relation settings diff --git a/tbl_properties_structure.php b/tbl_properties_structure.php index 3756ddb2c..71366f766 100644 --- a/tbl_properties_structure.php +++ b/tbl_properties_structure.php @@ -34,7 +34,7 @@ if ((!empty($submit_mult) && isset($selected_fld)) /** * Runs common work */ -require_once('./tbl_properties_common.php'); +require_once('./libraries/tbl_properties_common.php'); $url_query .= '&goto=tbl_properties_structure.php&back=tbl_properties_structure.php'; /** diff --git a/tbl_relation.php b/tbl_relation.php index b72eb4aca..90da28108 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -6,7 +6,7 @@ * Gets some core libraries */ require_once('./libraries/common.lib.php'); -require_once('./tbl_properties_common.php'); +require_once('./libraries/tbl_properties_common.php'); $url_query .= '&goto=tbl_properties.php'; diff --git a/tbl_select.php b/tbl_select.php index 7cf09b797..d52c900ab 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -28,7 +28,7 @@ if ( $GLOBALS['cfg']['PropertiesIconic'] == true ) { */ if (!isset($param) || $param[0] == '') { // Gets some core libraries - require_once('./tbl_properties_common.php'); + require_once('./libraries/tbl_properties_common.php'); //$err_url = 'tbl_select.php' . $err_url; $url_query .= '&goto=tbl_select.php&back=tbl_select.php';