diff options
| author | Piotr Przybylski <piotrprz@gmail.com> | 2011-06-30 02:48:19 +0400 |
|---|---|---|
| committer | Piotr Przybylski <piotrprz@gmail.com> | 2011-06-30 02:48:19 +0400 |
| commit | 7255ec21004d6453d3fe0f9b7f6176fa321ac96e (patch) | |
| tree | 921540a0e3c621e80baa28cfe9fb8ae1cf04507f /db_search.php | |
| parent | 04fef01fd7aaca08511fed2600b539ef8c64825a (diff) | |
Change PMA_DBI_get_columns() to always return complex descriptions, never simple column list (it was needed for one case anyway)
Bugfixes
Diffstat (limited to 'db_search.php')
| -rw-r--r-- | db_search.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/db_search.php b/db_search.php index f92c1c9089..3f3c7cc5e7 100644 --- a/db_search.php +++ b/db_search.php @@ -153,16 +153,16 @@ if (isset($_REQUEST['submit_search'])) { $thefieldlikevalue = array(); foreach ($tblfields as $tblfield) { - if (! isset($field) || strlen($field) == 0 || $tblfield == $field) { + if (! isset($field) || strlen($field) == 0 || $tblfield['Field'] == $field) { // Drizzle has no CONVERT and all text columns are UTF-8 if (PMA_DRIZZLE) { - $thefieldlikevalue[] = PMA_backquote($tblfield) + $thefieldlikevalue[] = PMA_backquote($tblfield['Field']) . ' ' . $like_or_regex . ' ' . "'" . $automatic_wildcard . $search_word . $automatic_wildcard . "'"; } else { - $thefieldlikevalue[] = 'CONVERT(' . PMA_backquote($tblfield) . ' USING utf8)' + $thefieldlikevalue[] = 'CONVERT(' . PMA_backquote($tblfield['Field']) . ' USING utf8)' . ' ' . $like_or_regex . ' ' . "'" . $automatic_wildcard . $search_word |