From c70930403c9a7d7211b0c6f5a2f6c006d75c07ab Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 12 Apr 2006 18:53:03 +0000 Subject: [PATCH] variable clashing --- libraries/db_table_exists.lib.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/db_table_exists.lib.php b/libraries/db_table_exists.lib.php index e66135e6a..0a7ada499 100644 --- a/libraries/db_table_exists.lib.php +++ b/libraries/db_table_exists.lib.php @@ -31,11 +31,11 @@ if (empty($is_db)) { if (empty($is_table)) { // Not a valid table name -> back to the db_details.php if (isset($table) && strlen($table)) { - $result = PMA_DBI_try_query( + $_result = PMA_DBI_try_query( 'SHOW TABLES LIKE \'' . PMA_sqlAddslashes($table, true) . '\';', null, PMA_DBI_QUERY_STORE); - $is_table = @PMA_DBI_num_rows($result); - PMA_DBI_free_result($result); + $is_table = @PMA_DBI_num_rows($_result); + PMA_DBI_free_result($_result); } else { $is_table = false; } @@ -48,11 +48,11 @@ if (empty($is_table)) { // fast): // @todo should this check really only happen if IS_TRANSFORMATION_WRAPPER? - $result = PMA_DBI_try_query( + $_result = PMA_DBI_try_query( 'SELECT COUNT(*) FROM `' . PMA_sqlAddslashes($table, true) . '`;', null, PMA_DBI_QUERY_STORE); - $is_table = ($result && @PMA_DBI_num_rows($result)); - PMA_DBI_free_result($result); + $is_table = ($_result && @PMA_DBI_num_rows($_result)); + PMA_DBI_free_result($_result); } if (! $is_table) {