Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Przybylski <piotrprz@gmail.com>2011-08-04 22:19:43 +0400
committerPiotr Przybylski <piotrprz@gmail.com>2011-08-04 22:19:43 +0400
commit66665f326ae28740ea10939feebe223b702943b8 (patch)
tree5afaa242e8d25148b9ab5c3648a0754b6de46d53 /db_qbe.php
parent3fa5e89bb29bb481576a2cf81d3364402bef8dcf (diff)
parent4c62a5fed6efe79b9ab9c667458d365058a914dc (diff)
Merge remote-tracking branch 'origin/master' into drizzle
Conflicts: db_qbe.php js/server_status.js libraries/export/xml.php libraries/schema/Pdf_Relation_Schema.class.php tbl_printview.php tbl_structure.php
Diffstat (limited to 'db_qbe.php')
-rw-r--r--db_qbe.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/db_qbe.php b/db_qbe.php
index 00d39f6433..69264e8fb7 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -105,7 +105,7 @@ if (0 == $tbl_result_cnt) {
// The tables list gets from MySQL
while (list($tbl) = PMA_DBI_fetch_row($tbl_result)) {
- $fld_results = PMA_DBI_get_columns($db, $tbl, null, true);
+ $fld_results = PMA_DBI_get_columns($db, $tbl);
if (empty($tbl_names[$tbl]) && !empty($_REQUEST['TableList'])) {
$tbl_names[$tbl] = '';