diff options
| author | Madhura Jayaratne <madhura.cj@gmail.com> | 2012-08-06 20:34:02 +0400 |
|---|---|---|
| committer | Madhura Jayaratne <madhura.cj@gmail.com> | 2012-08-06 20:34:02 +0400 |
| commit | c4a5af9182cd8bb81717985ae908d029db1faabf (patch) | |
| tree | 724c54199b759c747cfe5015cc67aac1ff2cce95 /tbl_select.php | |
| parent | 073c76aea2a6326121c6fdb84b2e50a88155f222 (diff) | |
| parent | 7e0028e4afab115a89a18c1257c6132aa123fd25 (diff) | |
Merge branch 'QA_3_5'
Conflicts:
js/tbl_select.js
po/da.po
tbl_select.php
Diffstat (limited to 'tbl_select.php')
| -rw-r--r-- | tbl_select.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tbl_select.php b/tbl_select.php index 1e1c615d7b..7bc67d1856 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -41,7 +41,7 @@ $table_search = new PMA_TableSearch($db, $table, "normal"); /** * Not selection yet required -> displays the selection form */ -if (! isset($_POST['columnsToDisplay']) || $_POST['columnsToDisplay'][0] == '') { +if (! isset($_POST['columnsToDisplay']) && ! isset($_POST['displayAllColumns'])) { // Gets some core libraries include_once 'libraries/tbl_common.inc.php'; //$err_url = 'tbl_select.php' . $err_url; |