cvs: php-src /ext/mssql php_mssql.c
| From: | Felipe Pena | Date: | Tue, 20 Jan 2009 20:02:38 +0000 |
| Subject: | cvs: php-src /ext/mssql php_mssql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-55800@lists.php.net to get a copy of this message | ||
felipe Tue Jan 20 20:02:38 2009 UTC
Modified files:
/php-src/ext/mssql php_mssql.c
Log:
- Fixed bug #47087 (Second parameter of mssql_fetch_array() is ignored)
http://cvs.php.net/viewvc.cgi/php-src/ext/mssql/php_mssql.c?r1=1.188&r2=1.189&diff_format=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.188 php-src/ext/mssql/php_mssql.c:1.189
--- php-src/ext/mssql/php_mssql.c:1.188 Thu Jan 8 00:11:57 2009
+++ php-src/ext/mssql/php_mssql.c Tue Jan 20 20:02:37 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.188 2009/01/08 00:11:57 felipe Exp $ */
+/* $Id: php_mssql.c,v 1.189 2009/01/20 20:02:37 felipe Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -1479,6 +1479,7 @@
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &mssql_result_index,
&resulttype) == FAILURE) {
return;
}
+ result_type = (resulttype > 0 && (resulttype & MSSQL_BOTH)) ? resulttype :
result_type;
break;
default:
return;
@@ -1552,8 +1553,8 @@
}
/* }}} */
-/* {{{ proto object mssql_fetch_object(resource result_id [, int result_type])
- Returns a psuedo-object of the current row in the result set specified by result_id */
+/* {{{ proto object mssql_fetch_object(resource result_id)
+ Returns a pseudo-object of the current row in the result set specified by result_id */
PHP_FUNCTION(mssql_fetch_object)
{
php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MSSQL_ASSOC);