[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-2955-gc6493e3
The branch, master has been updated via c6493e39d36885d419d9cb8b930ccc8aedbf548d (commit) via 8f54092c2d69420ab2ea543ea930777a69785bdd (commit) from 0841fce11adc5e4029eea41c256f403a7bd56f98 (commit)
- Log ----------------------------------------------------------------- commit c6493e39d36885d419d9cb8b930ccc8aedbf548d Author: Michal Čihař mcihar@novell.com Date: Fri Jun 3 15:42:18 2011 +0200
Remove not used code
commit 8f54092c2d69420ab2ea543ea930777a69785bdd Author: Michal Čihař mcihar@novell.com Date: Fri Jun 3 15:41:59 2011 +0200
Remove forgotten references to $charset
-----------------------------------------------------------------------
Summary of changes: export.php | 4 ++-- import.php | 2 +- libraries/display_export.lib.php | 2 +- libraries/display_import.lib.php | 2 +- libraries/header_printview.inc.php | 2 +- pmd_general.php | 2 +- pmd_help.php | 6 +----- 7 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/export.php b/export.php index 1a60151..9471ba0 100644 --- a/export.php +++ b/export.php @@ -218,7 +218,7 @@ $output_kanji_conversion = function_exists('PMA_kanji_str_conv') && $type != 'xl
// Do we need to convert charset? $output_charset_conversion = $asfile && $GLOBALS['PMA_recoding_engine'] != PMA_CHARSET_NONE - && isset($charset_of_file) && $charset_of_file != $charset + && isset($charset_of_file) && $charset_of_file != 'utf-8' && $type != 'xls';
// Use on the fly compression? @@ -273,7 +273,7 @@ if ($asfile) { $filename = PMA_expandUserString($filename_template);
// convert filename to iso-8859-1, it is safer - $filename = PMA_convert_string($charset, 'iso-8859-1', $filename); + $filename = PMA_convert_string('utf-8', 'iso-8859-1', $filename);
// Grab basic dump extension and mime type // Check if the user already added extension; get the substring where the extension would be if it was included diff --git a/import.php b/import.php index 0b029e5..8837af2 100644 --- a/import.php +++ b/import.php @@ -343,7 +343,7 @@ if ($import_file != 'none' && !$error) {
// Convert the file's charset if necessary if ($GLOBALS['PMA_recoding_engine'] != PMA_CHARSET_NONE && isset($charset_of_file)) { - if ($charset_of_file != $charset) { + if ($charset_of_file != 'utf-8') { $charset_conversion = TRUE; } } elseif (isset($charset_of_file) && $charset_of_file != 'utf8') { diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 2460042..9f10d77 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -285,7 +285,7 @@ if(isset($_GET['sql_query'])) { echo '<option value="' . $temp_charset . '"'; if(isset($_GET['charset_of_file']) && ($_GET['charset_of_file'] != $temp_charset)) { echo ''; - } elseif ((empty($cfg['Export']['charset']) && $temp_charset == $charset) + } elseif ((empty($cfg['Export']['charset']) && $temp_charset == 'utf-8') || $temp_charset == $cfg['Export']['charset']) { echo ' selected="selected"'; } diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 3a9c2ea..756de10 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -190,7 +190,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { 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 ((empty($cfg['Import']['charset']) && $temp_charset == $charset) + if ((empty($cfg['Import']['charset']) && $temp_charset == 'utf-8') || $temp_charset == $cfg['Import']['charset']) { echo ' selected="selected"'; } diff --git a/libraries/header_printview.inc.php b/libraries/header_printview.inc.php index 4a30f2b..a96fb74 100644 --- a/libraries/header_printview.inc.php +++ b/libraries/header_printview.inc.php @@ -43,7 +43,7 @@ if ($text_dir == 'ltr') { <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $available_languages[$lang][1]; ?>" lang="<?php echo $available_languages[$lang][1]; ?>" dir="<?php echo $text_dir; ?>">
<head> -<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset; ?>" /> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="icon" href="./favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" /> <title><?php echo __('SQL result'); ?> - phpMyAdmin <?php echo PMA_VERSION ?></title> diff --git a/pmd_general.php b/pmd_general.php index 6da6b2e..1307571 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -22,7 +22,7 @@ $hidden = "hidden"; "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd%22%3E <html xmlns:v="urn:schemas-microsoft-com:vml" xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" lang="<?php echo $GLOBALS['available_languages'][$GLOBALS['lang']][1]; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>"> <head> - <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset ?>" /> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="icon" href="pmd/images/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="pmd/images/favicon.ico" type="image/x-icon" /> <link rel="stylesheet" type="text/css" href="pmd/styles/<?php echo $GLOBALS['PMD']['STYLE'] ?>/style1.css" /> diff --git a/pmd_help.php b/pmd_help.php index 2f5e006..f653b14 100644 --- a/pmd_help.php +++ b/pmd_help.php @@ -12,11 +12,7 @@ require_once 'pmd_common.php'; ?> <html> <head> -<?php if(0){ ?> -<meta http-equiv="Content-Type" content="text/html; charset=windows-1251" /> -<link rel="stylesheet" type="text/css" href="./libraries/pmd/styles/default/style1.css"> -<?php } ?> -<meta http-equiv="Content-Type" content="text/html; charset=<?php echo $charset ?>" /> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="stylesheet" type="text/css" href="./libraries/pmd/styles/<?php echo $GLOBALS['PMD']['STYLE'] ?>/style1.css"> <title>Designer</title> </head>
hooks/post-receive
-
Michal Čihař