The branch, master has been updated via 2490329af1d4f2a676512135db9b71222307326c (commit) from 43d5ad370af8b77f80e698e81d82d18672370257 (commit)

- Log ----------------------------------------------------------------- commit 2490329af1d4f2a676512135db9b71222307326c Author: Michal Čihař mcihar@novell.com Date: Wed Jul 21 13:40:40 2010 +0200

Remove obsolete comments.

-----------------------------------------------------------------------

Summary of changes: libraries/sqlvalidator.class.php | 20 ++------------------ 1 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/libraries/sqlvalidator.class.php b/libraries/sqlvalidator.class.php index 5a44c2b..8d1aac6 100644 --- a/libraries/sqlvalidator.class.php +++ b/libraries/sqlvalidator.class.php @@ -13,17 +13,8 @@ * Make sure you have a really recent PHP with PEAR support * run this: "pear install Mail_Mime Net_DIME SOAP" * - * If you got this file from somewhere other than phpMyAdmin - * please be aware that the latest copy will always be in the - * phpMyAdmin subversion tree as - * - * This code that also used to depend on the PHP overload module, but that has been - * removed now. - * * @access public * - * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { @@ -134,19 +125,13 @@ if (!$GLOBALS['sqlvalidator_error']) { "a_connectionTechnologyVersion" => $connection_technology_version, "a_interactive" => $interactive, ); + if ($GLOBALS['sqlvalidator_soap'] == 'PHP') { $ret = $obj->__soapCall("openSession", $use_array); } else { $ret = $obj->call("openSession", $use_array); }

- // This is the old version that needed the overload extension - /* $ret = $obj->openSession($username, $password, - $calling_program, $calling_program_version, - $target_dbms, $target_dbms_version, - $connection_technology, $connection_technology_version, - $interactive); */ - return $ret; } // end of the "_openSession()" function

@@ -171,14 +156,13 @@ if (!$GLOBALS['sqlvalidator_error']) { "a_SQL" => $sql, "a_resultType" => $this->output_type, ); + if ($GLOBALS['sqlvalidator_soap'] == 'PHP') { $res = $obj->__soapCall("validateSQL", $use_array); } else { $res = $obj->call("validateSQL", $use_array); }

- // This is the old version that needed the overload extension - // $res = $obj->validateSQL($session->sessionId, $session->sessionKey, $sql, $this->output_type); return $res; } // end of the "validateSQL()" function

hooks/post-receive