diff --git a/tbl_properties_options.php3 b/tbl_properties_options.php3 index 65fd95d2e..4f8fceaed 100755 --- a/tbl_properties_options.php3 +++ b/tbl_properties_options.php3 @@ -158,7 +158,7 @@ if (PMA_MYSQL_INT_VERSION >= 32322) { - +
diff --git a/tbl_properties_structure.php3 b/tbl_properties_structure.php3 index 46caabb98..f8d37561a 100755 --- a/tbl_properties_structure.php3 +++ b/tbl_properties_structure.php3 @@ -1,6 +1,7 @@ "> - diff --git a/tbl_properties_table_info.php3 b/tbl_properties_table_info.php3 index a2c539671..cb2b4177d 100755 --- a/tbl_properties_table_info.php3 +++ b/tbl_properties_table_info.php3 @@ -9,30 +9,29 @@ */ // The 'show table' statement works correct since 3.23.03 if (PMA_MYSQL_INT_VERSION >= 32303) { - $local_query = 'SHOW TABLE STATUS LIKE \'' . PMA_sqlAddslashes($table, TRUE) . '\''; - $table_info_result = PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url_0); - $showtable = PMA_mysql_fetch_array($table_info_result); - $tbl_type = strtoupper($showtable['Type']); - $table_info_num_rows = (isset($showtable['Rows']) ? $showtable['Rows'] : 0); - $show_comment = (isset($showtable['Comment']) ? $showtable['Comment'] : ''); + $local_query = 'SHOW TABLE STATUS LIKE \'' . PMA_sqlAddslashes($table, TRUE) . '\''; + $table_info_result = PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url_0); + $showtable = PMA_mysql_fetch_array($table_info_result); + $tbl_type = strtoupper($showtable['Type']); + $table_info_num_rows = (isset($showtable['Rows']) ? $showtable['Rows'] : 0); + $show_comment = (isset($showtable['Comment']) ? $showtable['Comment'] : ''); -// better logic, thanks to Loic: - $tmp = explode(' ', $showtable['Create_options']); - $tmp_cnt = count($tmp); + $tmp = explode(' ', $showtable['Create_options']); + $tmp_cnt = count($tmp); for ($i = 0; $i < $tmp_cnt; $i++) { - $tmp1 = explode('=', $tmp[$i]); + $tmp1 = explode('=', $tmp[$i]); if (isset($tmp1[1])) { - $$tmp1[0] = $tmp1[1]; + $$tmp1[0] = $tmp1[1]; } } // end for unset($tmp1); unset($tmp); } else { - $local_query = 'SELECT COUNT(*) AS count FROM ' . PMA_backquote($table); - $table_info_result = PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url_0); - $showtable = array(); - $table_info_num_rows = PMA_mysql_result($table_info_result, 0, 'count'); - $show_comment = ''; + $local_query = 'SELECT COUNT(*) AS count FROM ' . PMA_backquote($table); + $table_info_result = PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $err_url_0); + $showtable = array(); + $table_info_num_rows = PMA_mysql_result($table_info_result, 0, 'count'); + $show_comment = ''; } mysql_free_result($table_info_result);