Merge remote branch 'origin/master'

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.

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 <d3xter at users.sourceforge.net> and
- * Dan Wilson who built this patch for the Debian package.
  *
  * @package phpMyAdmin-Auth-Cookie
  * @version $Id$

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)

libraries/common.inc.php

@@ -567,13 +567,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
  */

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');

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

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 <markus@noga.de>
  *
  * @uses    PMA_Table::countRecords()
  * @uses    PMA_backquote()

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; 

tbl_change.php

@@ -197,7 +197,6 @@ if (isset($where_clause)) {
     $rows = array_fill(0, $cfg['InsertRows'], false);
 }
 
-// <markus@noga.de>
 // 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 <bernard@bmpsystems.com>
         // 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) {
                 </select>
             <?php
         }
-        // Change by Bernard M. Piller <bernard@bmpsystems.com>
         // We don't want binary data destroyed
         elseif ($field['is_binary'] || $field['is_blob']) {
             if (($cfg['ProtectBinary'] && $field['is_blob'])

tbl_printview.php

@@ -53,8 +53,7 @@ PMA_DBI_select_db($db);
 
 
 /**
- * Multi-tables printview thanks to Christophe Gesche from the "MySQL Form
+ * Multi-tables printview 
- * Generator for PHPMyAdmin" (http://sourceforge.net/projects/phpmysqlformgen/)
  */
 if (isset($selected_tbl) && is_array($selected_tbl)) {
     $the_tables   = $selected_tbl;

tbl_select.php

@@ -95,7 +95,6 @@ if (!isset($param) || $param[0] == '') {
     PMA_DBI_free_result($result);
     unset($result, $type);
 
-    // <markus@noga.de>
     // 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'])) {
             </td>
             <td>
         <?php
-        // <markus@noga.de>
         $field = $fields_list[$i];
 
         $foreignData = PMA_getForeignData($foreigners, $field, false, '', '');