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

variable clashing

Browse Source
This commit is contained in:
Marc Delisle
2006-04-12 18:53:03 +00:00
parent be110ca9b9
commit c70930403c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/db_table_exists.lib.php
View File

@@ -31,11 +31,11 @@ if (empty($is_db)) {
if (empty($is_table)) { if (empty($is_table)) {
// Not a valid table name -> back to the db_details.php // Not a valid table name -> back to the db_details.php
if (isset($table) && strlen($table)) { if (isset($table) && strlen($table)) {
$result = PMA_DBI_try_query( $_result = PMA_DBI_try_query(
'SHOW TABLES LIKE \'' . PMA_sqlAddslashes($table, true) . '\';', 'SHOW TABLES LIKE \'' . PMA_sqlAddslashes($table, true) . '\';',
null, PMA_DBI_QUERY_STORE); null, PMA_DBI_QUERY_STORE);
$is_table = @PMA_DBI_num_rows($result); $is_table = @PMA_DBI_num_rows($_result);
PMA_DBI_free_result($result); PMA_DBI_free_result($_result);
} else { } else {
$is_table = false; $is_table = false;
} }
@@ -48,11 +48,11 @@ if (empty($is_table)) {
// fast): // fast):
// @todo should this check really only happen if IS_TRANSFORMATION_WRAPPER? // @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) . '`;', 'SELECT COUNT(*) FROM `' . PMA_sqlAddslashes($table, true) . '`;',
null, PMA_DBI_QUERY_STORE); null, PMA_DBI_QUERY_STORE);
$is_table = ($result && @PMA_DBI_num_rows($result)); $is_table = ($_result && @PMA_DBI_num_rows($_result));
PMA_DBI_free_result($result); PMA_DBI_free_result($_result);
} }
if (! $is_table) { if (! $is_table) {