- MFH: Fixed bug #47087 (Second parameter of mssql_fetch_array() is ignored)

diff --git a/ext/mssql/php_mssql.c b/ext/mssql/php_mssql.c
index 0e67d20a65d2c525fe7580a871606068157a823b..b1f865e08b2f7a24e10448981c435a0bbd2a147e 100644 (file)
--- 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);