diff options
author | Chanaka Indrajith <pe.chanaka.ck@gmail.com> | 2012-05-08 22:27:59 +0400 |
---|---|---|
committer | Chanaka Indrajith <pe.chanaka.ck@gmail.com> | 2012-05-08 22:27:59 +0400 |
commit | dfc73d3494445ff9430e5d0b4f33f800c6e480e0 (patch) | |
tree | d8ee67b58cfcea6fe7d4365b79a25f14fafa5104 /tbl_select.php | |
parent | 004f4f5258a0820975e2da9fa02a6d3ba6622368 (diff) | |
parent | 0b0775fb28a3afe8dd48301518a730effd07b643 (diff) |
Resolved conflicts after merge
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 8ce4abe6f1..7503b6d6f3 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -223,7 +223,7 @@ echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params, '', 'topmenu2'); 'ASC' => __('Ascending'), 'DESC' => __('Descending') ); - echo PMA_display_html_radio('order', $choices, 'ASC', false, true, "formelement"); + echo PMA_getRadioFields('order', $choices, 'ASC', false, true, "formelement"); unset($choices); ?> </fieldset> |