From 1ece804688971fd75c274cbfa5c398438cc1548a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= Date: Mon, 1 Dec 2008 21:20:47 +0000 Subject: MFH: Fix mysql_fetch_* and tests after param parsing changes --- ext/mysql/php_mysql.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'ext/mysql/php_mysql.c') diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index b934c75927..b4a708d5ee 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -1963,8 +1963,6 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type, } else #endif { - result_type = MYSQL_BOTH; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &res, &result_type) == FAILURE) { return; } @@ -2109,7 +2107,7 @@ PHP_FUNCTION(mysql_fetch_row) MYSQL_RES *result; zval *mysql_result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &mysql_result) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &mysql_result) == FAILURE) { return; } ZEND_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, -1, "MySQL result", le_result); @@ -2146,7 +2144,7 @@ PHP_FUNCTION(mysql_fetch_array) zval *mysql_result; long mode = MYSQLND_FETCH_BOTH; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|l", &mysql_result, &mode) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &mysql_result, &mode) == FAILURE) { return; } ZEND_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, -1, "MySQL result", le_result); @@ -2167,7 +2165,7 @@ PHP_FUNCTION(mysql_fetch_assoc) MYSQL_RES *result; zval *mysql_result; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &mysql_result) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &mysql_result) == FAILURE) { return; } ZEND_FETCH_RESOURCE(result, MYSQL_RES *, &mysql_result, -1, "MySQL result", le_result); -- cgit v1.2.1