diff options
| author | Piotr Przybylski <piotrprz@gmail.com> | 2011-06-17 02:22:25 +0400 |
|---|---|---|
| committer | Piotr Przybylski <piotrprz@gmail.com> | 2011-06-17 02:22:25 +0400 |
| commit | 12f70e8938cd9e3c76e878669d3de4bf4cb725ec (patch) | |
| tree | 32e2fb534d8497a16d7b01008bb9fb8ae874cb32 /db_search.php | |
| parent | d607fa3e5cca1bd9c8e1817db81e9a281cf68610 (diff) | |
Replace all SHOW FIELDS calls with PMA_DBI_get_columns() or PMA_DBI_get_columns_sql()
Fix PMA_DBI_get_columns() in Drizzle when $full == false
Diffstat (limited to 'db_search.php')
| -rw-r--r-- | db_search.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/db_search.php b/db_search.php index a91bf87521..07b72db9f0 100644 --- a/db_search.php +++ b/db_search.php @@ -158,8 +158,7 @@ if (isset($_REQUEST['submit_search'])) { $sqlstr_delete = 'DELETE'; // Fields to select - $tblfields = PMA_DBI_fetch_result('SHOW FIELDS FROM ' . PMA_backquote($table) . ' FROM ' . PMA_backquote($GLOBALS['db']), - null, 'Field'); + $tblfields = PMA_DBI_get_columns($GLOBALS['db'], $table); // Table to use $sqlstr_from = ' FROM ' . PMA_backquote($GLOBALS['db']) . '.' . PMA_backquote($table); @@ -179,8 +178,8 @@ if (isset($_REQUEST['submit_search'])) { $thefieldlikevalue = array(); foreach ($tblfields as $tblfield) { - if (! isset($field) || strlen($field) == 0 || $tblfield == $field) { - $thefieldlikevalue[] = 'CONVERT(' . PMA_backquote($tblfield) . ' USING utf8)' + if (! isset($field) || strlen($field) == 0 || $tblfield['Field'] == $field) { + $thefieldlikevalue[] = 'CONVERT(' . PMA_backquote($tblfield['Field']) . ' USING utf8)' . ' ' . $like_or_regex . ' ' . "'" . $automatic_wildcard . $search_word |