The branch, master has been updated
via 79f320e95104ba4017d1ad78b81c3964c7df4871 (commit)
from 9d9d88b83f82a2026336f19140c23a313d75bd56 (commit)
- Log -----------------------------------------------------------------
commit 79f320e95104ba4017d1ad78b81c3964c7df4871
Author: Marc Delisle <[email protected]>
Date: Sat Dec 4 06:41:10 2010 -0500
remove author names
-----------------------------------------------------------------------
Summary of changes:
db_qbe.php | 4 ++--
libraries/common.inc.php | 2 --
libraries/common.lib.php | 4 ----
libraries/ip_allow_deny.lib.php | 2 +-
libraries/sqlparser.lib.php | 4 ----
tbl_alter.php | 1 -
6 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/db_qbe.php b/db_qbe.php
index f4f4e85..ea95884 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -246,7 +246,7 @@ for ($x = 0; $x < $col; $x++) {
// If they have chosen all fields using the * selector,
// then sorting is not available
- // Robbat2 - Fix for Bug #570698
+ // Fix for Bug #570698
if (isset($Sort[$x]) && isset($Field[$x])
&& substr($Field[$x], -2) == '.*') {
$Sort[$x] = '';
@@ -936,7 +936,7 @@ for ($x = 0; $x < $col; $x++) {
if (!empty($curField[$x]) && !empty($curSort[$x])) {
// if they have chosen all fields using the * selector,
// then sorting is not available
- // Robbat2 - Fix for Bug #570698
+ // Fix for Bug #570698
if (substr($curField[$x], -2) != '.*') {
$qry_orderby .= $curField[$x] . ' ' . $curSort[$x];
$last_orderby = 1;
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index e4ce8c8..dda4b95 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -731,7 +731,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
/**
* Lookup server by name
- * by Arnold - Helder Hosting
* (see FAQ 4.8)
*/
if (! empty($_REQUEST['server']) && is_string($_REQUEST['server'])
@@ -838,7 +837,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
// Based on mod_access in Apache:
//
http://cvs.apache.org/viewcvs.cgi/httpd-2.0/modules/aaa/mod_access.c?rev=1.37&content-type=text/vnd.viewcvs-markup
// Look at: "static int check_dir_access(request_rec *r)"
- // Robbat2 - May 10, 2002
if (isset($cfg['Server']['AllowDeny'])
&& isset($cfg['Server']['AllowDeny']['order'])) {
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index ca99014..6bfb7c7 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -557,8 +557,6 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
}
// --- Added to solve bug #641765
- // Robbat2 - 12 January 2003, 9:46PM
- // Revised, Robbat2 - 13 January 2003, 2:59PM
if (!function_exists('PMA_SQP_isError') || PMA_SQP_isError()) {
$formatted_sql = htmlspecialchars($the_query);
} elseif (empty($the_query) || trim($the_query) == '') {
@@ -578,8 +576,6 @@ function PMA_mysqlDie($error_message = '', $the_query = '',
// username/password
if (!empty($the_query) && !strstr($the_query, 'connect')) {
// --- Added to solve bug #641765
- // Robbat2 - 12 January 2003, 9:46PM
- // Revised, Robbat2 - 13 January 2003, 2:59PM
if (function_exists('PMA_SQP_isError') && PMA_SQP_isError()) {
$error_msg_output .= PMA_SQP_getErrorString() . "\n";
$error_msg_output .= '<br />' . "\n";
diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php
index 69cab18..30bce24 100644
--- a/libraries/ip_allow_deny.lib.php
+++ b/libraries/ip_allow_deny.lib.php
@@ -46,7 +46,7 @@ function PMA_getIp()
* Based on IP Pattern Matcher
* Originally by J.Adams <[email protected]>
* Found on <http://www.php.net/manual/en/function.ip2long.php>
- * Modified by Robbat2 <[email protected]>
+ * Modified for phpMyAdmin
*
* Matches:
* xxx.xxx.xxx.xxx (exact)
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index a9568c4..a6676e4 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -86,7 +86,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
*
* @access public
*/
- // Added, Robbat2 - 13 Janurary 2003, 2:59PM
function PMA_SQP_resetError()
{
global $SQP_errorString;
@@ -101,7 +100,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
*
* @access public
*/
- // Added, Robbat2 - 13 Janurary 2003, 2:59PM
function PMA_SQP_getErrorString()
{
global $SQP_errorString;
@@ -115,7 +113,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
*
* @access public
*/
- // Added, Robbat2 - 13 Janurary 2003, 2:59PM
function PMA_SQP_isError()
{
global $SQP_errorString;
@@ -131,7 +128,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
* @access private
* @scope SQL Parser internal
*/
- // Revised, Robbat2 - 13 Janurary 2003, 2:59PM
function PMA_SQP_throwError($message, $sql)
{
global $SQP_errorString;
diff --git a/tbl_alter.php b/tbl_alter.php
index ba8c048..b7ab440 100644
--- a/tbl_alter.php
+++ b/tbl_alter.php
@@ -92,7 +92,6 @@ if (isset($_REQUEST['do_save_data'])) {
// To allow replication, we first select the db to use and then run queries
// on this db.
PMA_DBI_select_db($db) or PMA_mysqlDie(PMA_DBI_getError(), 'USE ' .
PMA_backquote($db) . ';', '', $err_url);
- // Optimization fix - 2 May 2001 - Robbat2
$sql_query = 'ALTER TABLE ' . PMA_backquote($table) . ' ' . implode(', ',
$changes) . $key_query;
$result = PMA_DBI_try_query($sql_query);
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
What happens now with your Lotus Notes apps - do you make another costly
upgrade, or settle for being marooned without product support? Time to move
off Lotus Notes and onto the cloud with Force.com, apps are easier to build,
use, and manage than apps on traditional platforms. Sign up for the Lotus
Notes Migration Kit to learn more. http://p.sf.net/sfu/salesforce-d2d
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
