diff options
| author | Xinchen Hui <laruence@php.net> | 2014-05-20 15:50:41 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2014-05-20 15:50:41 +0800 |
| commit | f2028491aa44367dbf77cc1008e9e4b027f60666 (patch) | |
| tree | 8377e27cb7145df823751ead056f8857f140f870 /ext/pgsql/pgsql.c | |
| parent | e1317ed5176d9c467d885c3149fa668822172cb1 (diff) | |
| parent | 4d299b5092ac18e158073ac92ad606fd4858b05c (diff) | |
| download | php-git-f2028491aa44367dbf77cc1008e9e4b027f60666.tar.gz | |
Merge branch 'phpng' of https://git.php.net/repository/php-src into phpng
Conflicts:
ext/pdo_pgsql/tests/common.phpt
Diffstat (limited to 'ext/pgsql/pgsql.c')
| -rw-r--r-- | ext/pgsql/pgsql.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 9d8cf2d9b3..550c1dda4a 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -3036,7 +3036,7 @@ PHP_FUNCTION(pg_free_result) } ZEND_FETCH_RESOURCE(pg_result, pgsql_result_handle *, result, -1, "PostgreSQL result", le_result); - if (Z_LVAL_P(result) == 0) { + if (Z_RES_P(result) == NULL) { RETURN_FALSE; } zend_list_close(Z_RES_P(result)); @@ -5787,7 +5787,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con } convert_to_boolean(is_enum); - if (Z_LVAL_P(is_enum)) { + if (Z_TYPE_P(is_enum) == IS_TRUE) { /* enums need to be treated like strings */ data_type = PG_TEXT; } else { |