archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.1' into PHP-7.2

Browse source 
* PHP-7.1:
  [ci skip] Update NEWS
  fix bug #77079
This commit is contained in:
Peter Kokot 2018-10-30 00:22:26 +01:00
commit b1de24e68c
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/odbc/php_odbc.c
View file

@ -1845,7 +1845,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)
{
@ -1856,7 +1856,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)
{