From b0391c3e263fd40515fb30e5cdc8f0dfed0b65ec Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Mon, 11 Nov 2019 10:06:21 +0100 Subject: [PATCH] Revert "Fix #78790: mysqli_get_client_info() expects exactly 0 parameters" This reverts commit 87fad8cdf0b978bb7dca5123cb77efd1449c0132, since, apparently, `mysqli_get_client_info()` is also supposed to be called without argument. --- ext/mysqli/mysqli_api.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index e51c0cc7418..aac3134a598 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -1374,9 +1374,7 @@ PHP_FUNCTION(mysqli_free_result) Get MySQL client info */ PHP_FUNCTION(mysqli_get_client_info) { - zval *mysql_link; - - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { + if (zend_parse_parameters_none() == FAILURE) { return; } @@ -2633,9 +2631,7 @@ PHP_FUNCTION(mysqli_thread_id) Return whether thread safety is given or not */ PHP_FUNCTION(mysqli_thread_safe) { - zval *mysql_link; - - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { + if (zend_parse_parameters_none() == FAILURE) { return; }