Permalink
Browse files

bug #2080963 [charset] Clarify doc and improved code

  • Loading branch information...
1 parent 575dde5 commit bc4ad522c988dc8866ac269c91705d213e6f26d4 @lem9 lem9 committed Sep 7, 2008
Showing with 15 additions and 18 deletions.
  1. +2 −0 ChangeLog
  2. +6 −6 libraries/display_export.lib.php
  3. +7 −12 libraries/display_import.lib.php
View
@@ -80,6 +80,8 @@ danbarry
- bug #2066923 [display] Navi browse icon does not go to page 1
- patch #2075263 [auth] Single sign-on and cookie clearing,
thanks to Charles Suh - cws125
+- bug #2080963 [charset] Clarify doc and improved code, thanks to
+ Victor Volkov - hanut
2.11.9.0 (2008-08-28)
- bug #2031221 [auth] Links to version number on login screen
@@ -207,17 +207,17 @@ function PMA_exportIsActive($what, $val) {
echo ' <label for="select_charset_of_file">'
. $strCharsetOfFile . '</label>' . "\n";
- $temp_charset = reset($cfg['AvailableCharsets']);
- echo ' <select id="select_charset_of_file" name="charset_of_file" size="1">' . "\n";
- foreach ($cfg['AvailableCharsets'] as $key => $temp_charset) {
- echo ' <option value="' . $temp_charset . '"';
+ reset($cfg['AvailableCharsets']);
+ echo '<select id="select_charset_of_file" name="charset_of_file" size="1">';
+ foreach ($cfg['AvailableCharsets'] as $temp_charset) {
+ echo '<option value="' . $temp_charset . '"';
if ((empty($cfg['Export']['charset']) && $temp_charset == $charset)
|| $temp_charset == $cfg['Export']['charset']) {
echo ' selected="selected"';
}
- echo '>' . $temp_charset . '</option>' . "\n";
+ echo '>' . $temp_charset . '</option>';
} // end foreach
- echo ' </select>';
+ echo '</select>';
} // end if
?>
</div>
@@ -83,22 +83,17 @@
// charset of file
echo '<div class="formelementrow">' . "\n";
if ($cfg['AllowAnywhereRecoding'] && $allow_recoding) {
- echo '<label for="charset_of_file">' . $strCharsetOfFile . '</label>' . "\n";
- $temp_charset = reset($cfg['AvailableCharsets']);
- echo ' <select id="charset_of_file" name="charset_of_file" size="1">' . "\n"
- . ' <option value="' . htmlentities($temp_charset) . '"';
- if ($temp_charset == $charset) {
- echo ' selected="selected"';
- }
- echo '>' . htmlentities($temp_charset) . '</option>' . "\n";
- while ($temp_charset = next($cfg['AvailableCharsets'])) {
- echo ' <option value="' . htmlentities($temp_charset) . '"';
+ echo '<label for="charset_of_file">' . $strCharsetOfFile . '</label>';
+ reset($cfg['AvailableCharsets']);
+ echo '<select id="charset_of_file" name="charset_of_file" size="1">';
+ foreach ($cfg['AvailableCharsets'] as $temp_charset) {
+ echo '<option value="' . htmlentities($temp_charset) . '"';
if ($temp_charset == $charset) {
echo ' selected="selected"';
}
- echo '>' . htmlentities($temp_charset) . '</option>' . "\n";
+ echo '>' . htmlentities($temp_charset) . '</option>';
}
- echo ' </select><br />' . "\n" . ' ';
+ echo ' </select><br />';
} else {
echo '<label for="charset_of_file">' . $strCharsetOfFile . '</label>' . "\n";
echo PMA_generateCharsetDropdownBox(PMA_CSDROPDOWN_CHARSET, 'charset_of_file', 'charset_of_file', 'utf8', FALSE);

0 comments on commit bc4ad52

Please sign in to comment.