From 66c6a301859d1ad47478a19a1e92a106fca057c8 Mon Sep 17 00:00:00 2001
From: lorilee <leelorik@gmail.com>
Date: Thu, 24 Jun 2010 16:55:55 -0400
Subject: [PATCH] Changed input element ID names to make more sense

---
 libraries/common.lib.php         | 4 ++--
 libraries/display_import.lib.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 835215cba..8992d70e9 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2862,7 +2862,7 @@ function PMA_js($code, $print=true)
  */
 function PMA_browseUploadFile($max_upload_size) {
     $uid = uniqid("");
-    echo '<label for="upload_file_input">' . __("Browse the server:") . '</label>';
+    echo '<label for="radio_import_file">' . __("Browse the server:") . '</label>';
     echo '<div id="upload_form_status" style="display: none;"></div>';
     echo '<div id="upload_form_status_info" style="display: none;"></div>';
     echo '<input type="file" name="import_file" id="input_import_file" />';
@@ -2875,7 +2875,7 @@ function PMA_browseUploadFile($max_upload_size) {
  * Display the form used to select a file to import from the server upload directory
  */
 function PMA_selectUploadFile($import_list, $uploaddir) {
-	echo '<label for="select_local_import_file">' . sprintf(__("Select from the web server upload directory <b>%s</b>:"), htmlspecialchars(PMA_userDir($uploaddir))) . '</label>';
+	echo '<label for="radio_local_import_file">' . sprintf(__("Select from the web server upload directory <b>%s</b>:"), htmlspecialchars(PMA_userDir($uploaddir))) . '</label>';
 	$extensions = '';
     foreach ($import_list as $key => $val) {
         if (!empty($extensions)) {
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index 2606c39d8..da219222a 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -145,11 +145,11 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
         <?php if($GLOBALS['is_upload'] && !empty($cfg['UploadDir'])) { ?>
             <ul>
             <li>
-                <input type="radio" name="file_location" id="upload_file_input" />
+                <input type="radio" name="file_location" id="radio_import_file" />
                 <?php PMA_browseUploadFile($max_upload_size); ?>
             </li>
             <li>
-                <input type="radio" name="file_location" id="upload_file_uploaddir" />
+                <input type="radio" name="file_location" id="radio_local_import_file" />
                 <?php PMA_selectUploadFile($import_list, $cfg['UploadDir']); ?>
             </li>
             </ul>