felipe Tue Jan 20 20:03:04 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mssql php_mssql.c
Log:
- MFH: 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.152.2.13.2.4.2.20&r2=1.152.2.13.2.4.2.21&diff_format=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.20
php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.21
--- php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.20 Thu Jan 8 00:12:19 2009
+++ php-src/ext/mssql/php_mssql.c Tue Jan 20 20:03:04 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mssql.c,v 1.152.2.13.2.4.2.20 2009/01/08 00:12:19 felipe Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.13.2.4.2.21 2009/01/20 20:03:04 felipe Exp $ */
#ifdef COMPILE_DL_MSSQL
#define HAVE_MSSQL 1
@@ -1477,6 +1477,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;
@@ -1557,8 +1558,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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
