Merge branch 'PHP-7.3'

* PHP-7.3:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  fix bug #77079
This commit is contained in:
Peter Kokot 2018-10-30 00:24:20 +01:00
commit 4828fb7b6b

View file

@ -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)
{