fixed undefined variables (moved table related output after possible table changes)

This commit is contained in:
Sebastian Mendel
2005-12-08 13:08:28 +00:00
parent fb53db0807
commit 7e5b651bec
3 changed files with 14 additions and 9 deletions

View File

@@ -18,10 +18,12 @@ require_once('./libraries/bookmark.lib.php');
* Set parameters for links * Set parameters for links
*/ */
$url_query = PMA_generate_common_url($db, $table); $url_query = PMA_generate_common_url($db, $table);
$url_params = array(
'db' => $db, if ( ! isset( $url_params ) ) {
'table' => $table, $url_params = array();
); }
$url_params['db'] = $db;
$url_params['table'] = $table;
/** /**
* Defines the urls to return to in case of error in a sql statement * Defines the urls to return to in case of error in a sql statement

View File

@@ -18,6 +18,8 @@ if ( PMA_MYSQL_INT_VERSION >= 50002 && $db === 'information_schema' ) {
$db_is_information_schema = false; $db_is_information_schema = false;
} }
$url_query = PMA_generate_common_url($db, $table);
/** /**
* Ensures the database and the table exist (else move to the "parent" script) * Ensures the database and the table exist (else move to the "parent" script)
*/ */

View File

@@ -8,10 +8,6 @@ require_once('./libraries/common.lib.php');
* Runs common work * Runs common work
*/ */
require('./tbl_properties_common.php'); require('./tbl_properties_common.php');
//$err_url = 'tbl_properties_operations.php' . $err_url;
$url_query .= '&goto=tbl_properties_operations.php&back=tbl_properties_operations.php';
$url_params['goto'] = 'tbl_properties_operations.php';
$url_params['back'] = 'tbl_properties_operations.php';
/** /**
* Gets relation settings * Gets relation settings
@@ -36,7 +32,6 @@ PMA_DBI_select_db($GLOBALS['db']);
require_once('./libraries/tbl_move_copy.php'); require_once('./libraries/tbl_move_copy.php');
require('./libraries/tbl_properties_table_info.inc.php'); require('./libraries/tbl_properties_table_info.inc.php');
$reread_info = false; $reread_info = false;
$errors = array(); $errors = array();
$table_alters = array(); $table_alters = array();
@@ -139,6 +134,12 @@ unset( $reread_info );
*/ */
require_once('./libraries/tbl_properties_links.inc.php'); require_once('./libraries/tbl_properties_links.inc.php');
if ( ! isset( $url_params ) ) {
$url_params = array();
}
$url_params['goto'] = 'tbl_properties_operations.php';
$url_params['back'] = 'tbl_properties_operations.php';
/** /**
* Get columns names * Get columns names
*/ */