cvs: pear /MDB2/MDB2/Driver mssql.php pgsql.php

quipo Tue Feb 12 21:26:23 2008 UTC Modified files: /pear/MDB2/MDB2/Driver mssql.php pgsql.php Log: cosmetics http://cvs.php.net/viewvc.cgi/pear/MDB2/MDB2/Driver/mssql.php?r1=1.166&r2=1.167&diff_format=u Index: pear/MDB2/MDB2/Driver/mssql.php diff -u pear/MDB2/MDB2/Driver/mssql.php:1.166 pear/MDB2/MDB2/Driver/mssql.php:1.167 --- pear/MDB2/MDB2/Driver/mssql.php:1.166 Mon Feb 4 18:57:46 2008 +++ pear/MDB2/MDB2/Driver/mssql.php Tue Feb 12 21:26:23 2008 @@ -43,7 +43,7 @@ // | Author: Frank M. Kromann <frank@kromann.info> | // +----------------------------------------------------------------------+ // -// $Id: mssql.php,v 1.166 2008/02/04 18:57:46 afz Exp $ +// $Id: mssql.php,v 1.167 2008/02/12 21:26:23 quipo Exp $ // // {{{ Class MDB2_Driver_mssql /** @@ -648,7 +648,7 @@ // cache server_info $this->connected_server_info = $server_info; if (!$native && !PEAR::isError($server_info)) { - if (preg_match('/([0-9]+)\.([0-9]+)\.([0-9]+)/', $server_info, $tmp)) { + if (preg_match('/(\d+)\.(\d+)\.(\d+)/', $server_info, $tmp)) { $server_info = array( 'major' => $tmp[1], 'minor' => $tmp[2], http://cvs.php.net/viewvc.cgi/pear/MDB2/MDB2/Driver/pgsql.php?r1=1.191&r2=1.192&diff_format=u Index: pear/MDB2/MDB2/Driver/pgsql.php diff -u pear/MDB2/MDB2/Driver/pgsql.php:1.191 pear/MDB2/MDB2/Driver/pgsql.php:1.192 --- pear/MDB2/MDB2/Driver/pgsql.php:1.191 Sun Feb 3 20:10:33 2008 +++ pear/MDB2/MDB2/Driver/pgsql.php Tue Feb 12 21:26:23 2008 @@ -43,7 +43,7 @@ // | Author: Paul Cooper <pgc@ucecom.com> | // +----------------------------------------------------------------------+ // -// $Id: pgsql.php,v 1.191 2008/02/03 20:10:33 afz Exp $ +// $Id: pgsql.php,v 1.192 2008/02/12 21:26:23 quipo Exp $ /** * MDB2 PostGreSQL driver @@ -361,9 +361,9 @@ // {{{ _doConnect() /** - * do the grunt work of the connect + * do the grunt work of connecting to the database * - * @return connection on success or MDB2 Error Object on failure + * @return mixed connection resource on success, MDB2 Error Object on failure * @access protected */ function _doConnect($username, $password, $database_name, $persistent = false) @@ -430,7 +430,6 @@ } $connect_function = $persistent ? 'pg_pconnect' : 'pg_connect'; - $connection = @call_user_func_array($connect_function, $params); if (!$connection) { return $this->raiseError(MDB2_ERROR_CONNECT_FAILED, null, null, @@ -462,7 +461,7 @@ * * @return true on success, MDB2 Error Object on failure * @access public - **/ + */ function connect() { if (is_resource($this->connection)) {