diff --git a/.gitignore b/.gitignore index b492910cc1..dda2e0ecd9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,14 +1,14 @@ # Directory for creating releases -release +/release/ # Configuration files config.inc.php config.header.inc.php config.footer.inc.php # Upload/save dirs -upload -save +/upload/ +/save/ # For setup script -config +/config/ # ctags tags # Editor files @@ -22,12 +22,12 @@ phpmyadmin.wpj .idea *.sw[op] # Locales -locale +/locale/ # Backups *~ # Javascript sources -sources +/sources/ # API documentation -apidoc +/apidoc/ # Demo server revision-info.php diff --git a/ChangeLog b/ChangeLog index 66bc93bc81..f6cea742a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,10 @@ + rfe #2098927 Remember recent tables + rfe #3078542 Remember the last sort order for each table + AJAX for Create table in navigation panel ++ rfe #3310562 Wording about Column + +3.4.3.0 (not yet released) +- bug #3311170 [sync] Missing helper icons in Synchronize 3.4.2.0 (not yet released) - bug #3301249 [interface] Iconic table operations does not remove inline edit label @@ -24,6 +28,7 @@ - bug #3306958 [interface] Unnecessary Details slider - bug #3308476 [interface] "Show all" not persistent after a sort - bug #3308072 [auth] Version disclosure to anonymous visitors +- bug #3306981 [interface] pmahomme and table statistics 3.4.1.0 (2011-05-20) - bug #3301108 [interface] Synchronize and already configured host diff --git a/Documentation.html b/Documentation.html index 2ff0881ba0..ed6a5ca817 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1934,14 +1934,12 @@ $cfg['TrustedProxies'] =
Maximum number of characters shown in any non-numeric field on browse view. Can be turned off by a toggle button on the browse page.
-
$cfg['ModifyDeleteAtLeft'] boolean - $cfg['ModifyDeleteAtRight'] boolean +
$cfg['RowActionLinks'] string
Defines the place where table row links (Edit, Inline edit, Copy, - Delete) would be put when - tables contents are displayed (you may have them displayed both at the - left and at the right). - "Left" and "right" are parsed as "top" + Delete) would be put when tables contents are displayed (you may + have them displayed at the left side, right side, both sides or nowhere). + "left" and "right" are parsed as "top" and "bottom" with vertical display mode.
$cfg['DefaultDisplay'] string
diff --git a/export.php b/export.php index 22a6324261..9471ba0c15 100644 --- a/export.php +++ b/export.php @@ -147,7 +147,7 @@ function PMA_exportOutputHandler($line) if ($dump_buffer_len > $GLOBALS['memory_limit']) { if ($GLOBALS['output_charset_conversion']) { - $dump_buffer = PMA_convert_string($GLOBALS['charset'], $GLOBALS['charset_of_file'], $dump_buffer); + $dump_buffer = PMA_convert_string('utf-8', $GLOBALS['charset_of_file'], $dump_buffer); } // as bzipped if ($GLOBALS['compression'] == 'bzip' && @function_exists('bzcompress')) { @@ -181,7 +181,7 @@ function PMA_exportOutputHandler($line) } else { if ($GLOBALS['asfile']) { if ($GLOBALS['output_charset_conversion']) { - $line = PMA_convert_string($GLOBALS['charset'], $GLOBALS['charset_of_file'], $line); + $line = PMA_convert_string('utf-8', $GLOBALS['charset_of_file'], $line); } if ($GLOBALS['save_on_server'] && strlen($line) > 0) { $write_result = @fwrite($GLOBALS['file_handle'], $line); @@ -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 @@ -637,7 +637,7 @@ if ($save_on_server && isset($message)) { if (!empty($asfile)) { // Convert the charset if required. if ($output_charset_conversion) { - $dump_buffer = PMA_convert_string($GLOBALS['charset'], $GLOBALS['charset_of_file'], $dump_buffer); + $dump_buffer = PMA_convert_string('utf-8', $GLOBALS['charset_of_file'], $dump_buffer); } // Do the compression diff --git a/import.php b/import.php index 0b029e5c2f..8837af2fac 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/index.php b/index.php index 66f6bf5545..36a611878e 100644 --- a/index.php +++ b/index.php @@ -12,7 +12,6 @@ * or common.inc.php * @uses $GLOBALS['available_languages'] from common.inc.php (select_lang.lib.php) * @uses $GLOBALS['db'] - * @uses $GLOBALS['charset'] * @uses $GLOBALS['lang'] * @uses $GLOBALS['text_dir'] * @uses $_ENV['HTTP_HOST'] @@ -102,8 +101,7 @@ include ('./libraries/header_http.inc.php'); phpMyAdmin <?php echo PMA_VERSION; ?> - <?php echo htmlspecialchars($HTTP_HOST); ?> - + - - - - +