From 708c596779f8f1efbcefd801e9fac9fd0d1bb5ee Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 27 Jul 2006 17:14:30 +0000 Subject: [PATCH] bug #1521910, with selected ... print view --- ChangeLog | 3 +++ libraries/db_table_exists.lib.php | 2 +- libraries/mult_submits.inc.php | 2 +- tbl_printview.php | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05a086b69..f2fd42d5a 100755 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ $Source$ 2006-07-27 Marc Delisle * pdf_pages.php: automatic layout for InnoDB tables * tbl_properties_operations.php: problem switching from InnoDB to MyISAM + * tbl_printview.php, libraries/mult_submits.inc.php, + libraries/db_table_exists.lib.php: + bug #1521910, with selected ... print view 2006-07-26 Marc Delisle * server_privileges.php: bug #1526557, display error when admin diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php index 0a7ada499..75ef0d507 100644 --- a/libraries/db_table_exists.lib.php +++ b/libraries/db_table_exists.lib.php @@ -28,7 +28,7 @@ if (empty($is_db)) { } } // end if (ensures db exists) -if (empty($is_table)) { +if (empty($is_table) && !defined('PMA_SUBMIT_MULT')) { // Not a valid table name -> back to the db_details.php if (isset($table) && strlen($table)) { $_result = PMA_DBI_try_query( diff --git a/libraries/mult_submits.inc.php b/libraries/mult_submits.inc.php index 759fddfb6..7d555d53d 100644 --- a/libraries/mult_submits.inc.php +++ b/libraries/mult_submits.inc.php @@ -13,7 +13,7 @@ if (!empty($submit_mult) || ( isset($selected_fld) && !empty($selected_fld) ) || !empty($rows_to_delete) )) { - + define('PMA_SUBMIT_MULT', 1); if (isset($selected_db) && !empty($selected_db)) { $selected = $selected_db; $what = 'drop_db'; diff --git a/tbl_printview.php b/tbl_printview.php index 1d9c5f313..26154b2f3 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -45,7 +45,7 @@ PMA_DBI_select_db($db); /** - * Multi-tables printview thanks to Christophe Gesch� from the "MySQL Form + * Multi-tables printview thanks to Christophe Gesche from the "MySQL Form * Generator for PHPMyAdmin" (http://sourceforge.net/projects/phpmysqlformgen/) */ if (isset($selected_tbl) && is_array($selected_tbl)) { @@ -92,6 +92,7 @@ foreach ($the_tables as $key => $table) { $show_comment = (isset($showtable['Comment']) ? $showtable['Comment'] : ''); PMA_DBI_free_result($result); + $tbl_is_view = PMA_Table::isView($db, $table); // Gets table keys and store them in arrays $indexes = array();