[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5233-g16ed065
Dieter Adriaenssens
ruleant at users.sourceforge.net
Mon Jun 28 20:36:41 CEST 2010
The branch, master has been updated
via 16ed06531a00ebac5bd33b40fbdb8139639f726c (commit)
from 4986ee01742944b1c648cdcac0360cff653c12f8 (commit)
- Log -----------------------------------------------------------------
commit 16ed06531a00ebac5bd33b40fbdb8139639f726c
Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
Date: Mon Jun 28 20:36:12 2010 +0200
remove author names
-----------------------------------------------------------------------
Summary of changes:
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 d2e16ec..d524e1c 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 <d3xter at users.sourceforge.net> 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 66ce350..3e91e23 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 4c42a91..c2f68bc 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 180c463..2290324 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 587a67e..6aefe89 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 <markus at noga.de>
*
* @uses PMA_Table::countRecords()
* @uses PMA_backquote()
diff --git a/scripts/convertcfg.pl b/scripts/convertcfg.pl
index 1b636a1..14c0709 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 at users.sourceforge.net
-# Many thanks to Patrick Lougheed pat at tfsb.org
-#
while(<>)
{ s/\$cfg(\w+)/\$cfg\[\'$1\'\]/g;
diff --git a/tbl_change.php b/tbl_change.php
index 7e32e9b..051b1fc 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -197,7 +197,6 @@ if (isset($where_clause)) {
$rows = array_fill(0, $cfg['InsertRows'], false);
}
-// <markus at 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 at 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 at bmpsystems.com>
// 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 88c9a6b..7f7a8c8 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 e965c50..99936f3 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);
- // <markus at 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 at noga.de>
$field = $fields_list[$i];
$foreignData = PMA_getForeignData($foreigners, $field, false, '', '');
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list