summaryrefslogtreecommitdiff
path: root/ext/odbc
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2018-10-30 00:24:20 +0100
committerPeter Kokot <peterkokot@gmail.com>2018-10-30 00:24:20 +0100
commit4828fb7b6b84f84cbe9840a100a4879bb2113a8e (patch)
tree9317511d4704f0fc0ba84750e0ee3d6d70d4a9ea /ext/odbc
parent6da3eac56a2a0750fcc5900525447a8d218af87f (diff)
parent17df3a194b965256447fd253c46f0aaca4d5fdbd (diff)
downloadphp-git-4828fb7b6b84f84cbe9840a100a4879bb2113a8e.tar.gz
Merge branch 'PHP-7.3'
* PHP-7.3: [ci skip] Update NEWS [ci skip] Update NEWS [ci skip] Update NEWS fix bug #77079
Diffstat (limited to 'ext/odbc')
-rw-r--r--ext/odbc/php_odbc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c
index 429ce073ae..b7b67562a4 100644
--- a/ext/odbc/php_odbc.c
+++ b/ext/odbc/php_odbc.c
@@ -1838,7 +1838,7 @@ static void php_odbc_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type)
/* }}} */
-/* {{{ proto object odbc_fetch_object(int result [, int rownumber])
+/* {{{ proto object odbc_fetch_object(resource result [, int rownumber])
Fetch a result row as an object */
PHP_FUNCTION(odbc_fetch_object)
{
@@ -1849,7 +1849,7 @@ PHP_FUNCTION(odbc_fetch_object)
}
/* }}} */
-/* {{{ proto array odbc_fetch_array(int result [, int rownumber])
+/* {{{ proto array odbc_fetch_array(resource result [, int rownumber])
Fetch a result row as an associative array */
PHP_FUNCTION(odbc_fetch_array)
{