From 9c3ad0c8b1ebc18efa7adb681cfd960aa6f2cc26 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 28 Jun 2010 07:36:13 -0400 Subject: [PATCH 1/5] 3.3.4 release --- ChangeLog | 2 +- Documentation.html | 4 ++-- README | 4 ++-- libraries/Config.class.php | 2 +- translators.html | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1045feebb..c277ceeb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $ -3.3.4.0 (not yet released) +3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value - bug #2998889 [import] Import button does not work in Catalan - [browse] Fix handling of sort order if only column is specified. diff --git a/Documentation.html b/Documentation.html index 8aaa00918..8fd48c257 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 - phpMyAdmin 3.3.4-rc1 - Documentation + phpMyAdmin 3.3.4 - Documentation @@ -18,7 +18,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78 diff --git a/README b/README index 9973a5da4..86975cb5d 100644 --- a/README +++ b/README @@ -5,8 +5,8 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.3.4-rc1 - ----------------- + Version 3.3.4 + ------------- http://www.phpmyadmin.net/ Copyright (C) 1998-2000 Tobias Ratschiller diff --git a/libraries/Config.class.php b/libraries/Config.class.php index e17ecea40..8515fda13 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.3.4-rc1'); + $this->set('PMA_VERSION', '3.3.4'); /** * @deprecated */ diff --git a/translators.html b/translators.html index 66a8d9f01..850e6246d 100644 --- a/translators.html +++ b/translators.html @@ -11,7 +11,7 @@ - phpMyAdmin 3.3.4-rc1 - Official translators + phpMyAdmin 3.3.4 - Official translators @@ -19,7 +19,7 @@ From c699af70e9ff7ae66dd963785f205f7b1f38fb2d Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 28 Jun 2010 07:37:55 -0400 Subject: [PATCH 2/5] 3.3.4 release --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 62009196e..1840c483b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,7 +9,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - patch #2932113 [information_schema] Slow export when having lots of databases, thanks to Stéphane Pontier - shadow_walker -3.3.4.0 (not yet released) +3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value - bug #2998889 [import] Import button does not work in Catalan - [browse] Fix handling of sort order if only column is specified. From af6c9cf8a8841a6a69ee9bf414cc49bb4d768ef5 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 28 Jun 2010 07:38:57 -0400 Subject: [PATCH 3/5] 3.3.4 release --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4572a255d..7492e7377 100644 --- a/ChangeLog +++ b/ChangeLog @@ -89,7 +89,7 @@ $Id$ - patch #2932113 [information_schema] Slow export when having lots of databases, thanks to Stéphane Pontier - shadow_walker -3.3.4.0 (not yet released) +3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value - bug #2998889 [import] Import button does not work in Catalan - [browse] Fix handling of sort order if only column is specified. From 4986ee01742944b1c648cdcac0360cff653c12f8 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 28 Jun 2010 09:25:45 -0400 Subject: [PATCH 4/5] lang directory no longer exists; I guess this mechanism is no longer needed --- libraries/common.inc.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 710ecdfc4..5366c18ec 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -563,13 +563,6 @@ $GLOBALS['footnotes'] = array(); /******************************************************************************/ /* loading language file LABEL_loading_language_file */ -/** - * Added messages while developing: - */ -if (file_exists('./lang/added_messages.php')) { - include './lang/added_messages.php'; -} - /** * lang detection is done here */ From 16ed06531a00ebac5bd33b40fbdb8139639f726c Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Mon, 28 Jun 2010 20:36:12 +0200 Subject: [PATCH 5/5] remove author names --- libraries/auth/cookie.auth.lib.php | 2 -- libraries/auth/swekey/swekey.php | 2 +- libraries/export/sql.php | 2 +- libraries/ob.lib.php | 2 -- libraries/relation.lib.php | 1 - scripts/convertcfg.pl | 3 --- tbl_change.php | 3 --- tbl_printview.php | 3 +-- tbl_select.php | 2 -- 9 files changed, 3 insertions(+), 17 deletions(-) diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index d2e16ec54..d524e1cb1 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -2,8 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * Set of functions used to run cookie based authentication. - * Thanks to Piotr Roszatycki and - * Dan Wilson who built this patch for the Debian package. * * @package phpMyAdmin-Auth-Cookie * @version $Id$ diff --git a/libraries/auth/swekey/swekey.php b/libraries/auth/swekey/swekey.php index 66ce3504d..3e91e230e 100644 --- a/libraries/auth/swekey/swekey.php +++ b/libraries/auth/swekey/swekey.php @@ -390,7 +390,7 @@ function Swekey_GetFastHalfRndToken() $_SESSION['rnd-token-date'] = time(); if (! empty($cachefile)) { - // we unlink the file so no possible tempfile race attack (thanks Thijs) + // we unlink the file so no possible tempfile race attack unlink($cachefile); $file = fopen($cachefile , "x"); if ($file != FALSE) diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 4c42a91c2..c2f68bcae 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -535,7 +535,7 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $a $schema_create .= 'DROP TABLE IF EXISTS ' . PMA_backquote($table, $sql_backquotes) . ';' . $crlf; } - // Steve Alberty's patch for complete table dump, + // Complete table dump, // Whether to quote table and fields names or not if ($sql_backquotes) { PMA_DBI_query('SET SQL_QUOTE_SHOW_CREATE = 1'); diff --git a/libraries/ob.lib.php b/libraries/ob.lib.php index 180c463fe..22903247e 100644 --- a/libraries/ob.lib.php +++ b/libraries/ob.lib.php @@ -41,8 +41,6 @@ function PMA_outBufferModeGet() // any right frame file in phpMyAdmin will not be handled properly by // the browser. My fix was to check the ini file within the // PMA_outBufferModeGet() function. - // - // (Patch by Garth Gillespie, modified by Marc Delisle) $mode = 0; } elseif (function_exists('ob_get_level') && ob_get_level() > 0) { // If output buffering is enabled in php.ini it's not possible to diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 587a67e20..6aefe89d2 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -965,7 +965,6 @@ function PMA_foreignDropdown($disp_row, $foreign_field, $foreign_display, $data, /** * Gets foreign keys in preparation for a drop-down selector - * Thanks to * * @uses PMA_Table::countRecords() * @uses PMA_backquote() diff --git a/scripts/convertcfg.pl b/scripts/convertcfg.pl index 1b636a161..14c0709f1 100755 --- a/scripts/convertcfg.pl +++ b/scripts/convertcfg.pl @@ -7,9 +7,6 @@ # # Takes input from STDIN, sends output to STDOUT # -# By Robin Johnson robbat2@users.sourceforge.net -# Many thanks to Patrick Lougheed pat@tfsb.org -# while(<>) { s/\$cfg(\w+)/\$cfg\[\'$1\'\]/g; diff --git a/tbl_change.php b/tbl_change.php index 7e32e9b78..051b1fc23 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -197,7 +197,6 @@ if (isset($where_clause)) { $rows = array_fill(0, $cfg['InsertRows'], false); } -// // retrieve keys into foreign fields, if any $foreigners = PMA_getForeigners($db, $table); @@ -507,7 +506,6 @@ foreach ($rows as $row_id => $vrow) { // The function column // ------------------- - // Change by Bernard M. Piller // We don't want binary data to be destroyed // Note: from the MySQL manual: "BINARY doesn't affect how the column is // stored or retrieved" so it does not mean that the contents is @@ -831,7 +829,6 @@ foreach ($rows as $row_id => $vrow) { // We don't want binary data destroyed elseif ($field['is_binary'] || $field['is_blob']) { if (($cfg['ProtectBinary'] && $field['is_blob']) diff --git a/tbl_printview.php b/tbl_printview.php index 88c9a6bd9..7f7a8c804 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -53,8 +53,7 @@ PMA_DBI_select_db($db); /** - * Multi-tables printview thanks to Christophe Gesche from the "MySQL Form - * Generator for PHPMyAdmin" (http://sourceforge.net/projects/phpmysqlformgen/) + * Multi-tables printview */ if (isset($selected_tbl) && is_array($selected_tbl)) { $the_tables = $selected_tbl; diff --git a/tbl_select.php b/tbl_select.php index e965c50d7..99936f36e 100644 --- a/tbl_select.php +++ b/tbl_select.php @@ -95,7 +95,6 @@ if (!isset($param) || $param[0] == '') { PMA_DBI_free_result($result); unset($result, $type); - // // retrieve keys into foreign fields, if any // check also foreigners even if relwork is FALSE (to get // foreign keys from innodb) @@ -183,7 +182,6 @@ while (list($operator) = each($GLOBALS['cfg']['UnaryOperators'])) { $field = $fields_list[$i]; $foreignData = PMA_getForeignData($foreigners, $field, false, '', '');