From 6d63f4bbd19698040849f0985dfb11f7d0da0b05 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 29 Dec 2007 21:06:30 +0000
Subject: [PATCH] use PMA_generate_html_radio()

---
 db_operations.php        | 18 ++++++++----------
 libraries/common.lib.php |  3 ++-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/db_operations.php b/db_operations.php
index 1c4afb7a4..60bd07be8 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -330,16 +330,14 @@ if (!$is_information_schema) {
     ?>
         </legend>
         <input type="text" name="newname" size="30" class="textfield" value="" /><br />
-        <input type="radio" name="what" value="structure"
-            id="radio_copy_structure" style="vertical-align: middle" />
-        <label for="radio_copy_structure"><?php echo $strStrucOnly; ?></label><br />
-        <input type="radio" name="what" value="data" id="radio_copy_data"
-            checked="checked" style="vertical-align: middle" />
-        <label for="radio_copy_data"><?php echo $strStrucData; ?></label><br />
-        <input type="radio" name="what" value="dataonly"
-            id="radio_copy_dataonly" style="vertical-align: middle" />
-        <label for="radio_copy_dataonly"><?php echo $strDataOnly; ?></label><br />
-
+<?php
+        $choices = array(
+            'structure' => $strStrucOnly,
+            'data'      => $strStrucData, 
+            'dataonly'  => $strDataOnly);
+        PMA_generate_html_radio('what', $choices, 'data', true);
+        unset($choices);
+?>
         <input type="checkbox" name="create_database_before_copying" value="1"
             id="checkbox_create_database_before_copying"
             style="vertical-align: middle" checked="checked" />
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 89419d8f0..eafa90499 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2293,10 +2293,11 @@ function PMA_generate_html_radio($html_field_name, $choices, $checked_choice = '
             echo ' checked="checked"';
         }
         echo ' />' . "\n";
-        echo '<label for="' . $html_field_id . '">' . htmlspecialchars($choice_label) . '</label>' . "\n";
+        echo '<label for="' . $html_field_id . '">' . htmlspecialchars($choice_label) . '</label>';
         if ($line_break) {
             echo '<br />';
         }
+        echo "\n";
     }
 }
 ?>