diff options
| author | Felipe Pena <felipe@php.net> | 2009-01-20 20:03:04 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2009-01-20 20:03:04 +0000 |
| commit | f1aadc30ea05fa19e9525b256730e49efeb35d66 (patch) | |
| tree | 92912d673ca547e7b09411605c7bf45f21d042ba /ext/mssql/php_mssql.c | |
| parent | 49295515d7b9712d137cf3ea50f51ff853bdf696 (diff) | |
| download | php-git-f1aadc30ea05fa19e9525b256730e49efeb35d66.tar.gz | |
- MFH: Fixed bug #47087 (Second parameter of mssql_fetch_array() is ignored)
Diffstat (limited to 'ext/mssql/php_mssql.c')
| -rw-r--r-- | ext/mssql/php_mssql.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c index 0e67d20a65..b1f865e08b 100644 --- a/ext/mssql/php_mssql.c +++ b/ext/mssql/php_mssql.c @@ -1477,6 +1477,7 @@ static void php_mssql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type) 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 @@ PHP_FUNCTION(mssql_fetch_row) } /* }}} */ -/* {{{ 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); |