nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved table related output after possible table changes (bug #1375752?, partly discussion of #1373804)

Browse Source
This commit is contained in:
Sebastian Mendel
2005-12-08 09:25:22 +00:00
parent 78e43bc480
commit 6d5746b7bb
2 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libraries/tbl_properties_links.inc.php
View File

@@ -13,6 +13,28 @@ PMA_checkParameters(array('db', 'table'));
*/ */
require_once('./libraries/bookmark.lib.php'); require_once('./libraries/bookmark.lib.php');
/**
* Set parameters for links
*/
$url_query = PMA_generate_common_url($db, $table);
$url_params = array(
'db' => $db,
'table' => $table,
);
/**
* Defines the urls to return to in case of error in a sql statement
*/
$err_url_0 = $cfg['DefaultTabDatabase'] . PMA_generate_common_url( array( 'db' => $db, ) );
$err_url = $cfg['DefaultTabTable'] . PMA_generate_common_url( $url_params );
/**
* Displays headers
*/
$js_to_run = 'functions.js';
require_once('./libraries/header.inc.php');
/** /**
* Displays links * Displays links
*/ */
@@ -42,7 +64,7 @@ $tabs['export']['icon'] = 'b_tblexport.png';
$tabs['export']['link'] = 'tbl_properties_export.php'; $tabs['export']['link'] = 'tbl_properties_export.php';
$tabs['export']['args']['single_table'] = 'true'; $tabs['export']['args']['single_table'] = 'true';
$tabs['export']['text'] = $strExport; $tabs['export']['text'] = $strExport;
/** /**
* Don't display , "Import", "Operations" and "Empty" * Don't display , "Import", "Operations" and "Empty"
* for views and information_schema * for views and information_schema
@@ -51,11 +73,11 @@ if ( ! $tbl_is_view && ! (isset($db_is_information_schema) && $db_is_information
$tabs['import']['icon'] = 'b_tblimport.png'; $tabs['import']['icon'] = 'b_tblimport.png';
$tabs['import']['link'] = 'tbl_import.php'; $tabs['import']['link'] = 'tbl_import.php';
$tabs['import']['text'] = $strImport; $tabs['import']['text'] = $strImport;
$tabs['operation']['icon'] = 'b_tblops.png'; $tabs['operation']['icon'] = 'b_tblops.png';
$tabs['operation']['link'] = 'tbl_properties_operations.php'; $tabs['operation']['link'] = 'tbl_properties_operations.php';
$tabs['operation']['text'] = $strOperations; $tabs['operation']['text'] = $strOperations;
if ($table_info_num_rows > 0) { if ($table_info_num_rows > 0) {
$ln8_stt = (PMA_MYSQL_INT_VERSION >= 40000) $ln8_stt = (PMA_MYSQL_INT_VERSION >= 40000)
? 'TRUNCATE TABLE ' ? 'TRUNCATE TABLE '

20
tbl_properties_common.php
View File

@@ -18,29 +18,9 @@ if ( PMA_MYSQL_INT_VERSION >= 50002 && $db === 'information_schema' ) {
$db_is_information_schema = false; $db_is_information_schema = false;
} }
/**
* Defines the urls to return to in case of error in a sql statement
*/
$err_url_0 = $cfg['DefaultTabDatabase'] . '?' . PMA_generate_common_url($db);
$err_url = $cfg['DefaultTabTable'] . '?' . 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)
*/ */
require_once('./libraries/db_table_exists.lib.php'); require_once('./libraries/db_table_exists.lib.php');
/**
* Displays headers
*/
$js_to_run = 'functions.js';
require_once('./libraries/header.inc.php');
/**
* Set parameters for links
*/
$url_query = PMA_generate_common_url($db, $table);
?> ?>