diff options
| author | Marc Delisle <marc@infomarc.info> | 2011-11-25 01:54:25 +0400 |
|---|---|---|
| committer | Marc Delisle <marc@infomarc.info> | 2011-11-25 01:54:25 +0400 |
| commit | 96dd071a5f2362d5a244656bf4acf240b5b1aac0 (patch) | |
| tree | ee3f0415d815deac1f1d0a45f7e622fa960a531a /tbl_select.php | |
| parent | 03fd5593823d6999e85792a910d460902f844db3 (diff) | |
| parent | 29455fe79bc9896129d7004e0242c451f4a32cc8 (diff) | |
Fix merge conflicts
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 71038143aa..c888291441 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -113,7 +113,7 @@ echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params, '', 'topmenu2'); } ?> <th><?php echo htmlspecialchars($fields_list[$i]); ?></th> - <td><?php echo $fields_type[$i]; ?></td> + <td><?php echo htmlspecialchars($fields_type[$i]); ?></td> <td><?php echo $fields_collation[$i]; ?></td> <td><select name="func[]"> <?php |