From 4d2cdc822462abc645814c37a49ece35f372150c Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Tue, 16 Dec 2003 01:00:45 +0000 Subject: [PATCH] MFH: Fixed Bug #26625 (pg_convert sets NULL incorrectly for character data types). --- NEWS | 2 ++ ext/pgsql/pgsql.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index a355c8bfbc..d1fd51621f 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,8 @@ PHP 4 NEWS send_default_content_type now sends value from php.ini). (Uwe Schindler) - Fixed bug #26635 (fixed look up for fonts in the current directory w/ZTS). (Ilia) +- Fixed Bug #26625 (pg_convert sets NULL incorrectly for character data + types). (Ilia) - Fixed bug #26604 (Apache2 SAPIs implicitly disable Keep-Alive). (Ilia) - Fixed bug #26595 (ext/domxml: XSLT_NAMESPACE undeclared). (Christian) - Fixed bug #26565 (strtotime("this month") resolving to the wrong month). diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index e34ecebb6f..49b906e9f2 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -3648,8 +3648,8 @@ PHPAPI int php_pgsql_convert(PGconn *pg_link, const char *table_name, const zval #else Z_STRVAL_P(new_val) = php_addslashes(Z_STRVAL_PP(val), Z_STRLEN_PP(val), &Z_STRLEN_P(new_val), 0 TSRMLS_CC); #endif + php_pgsql_add_quotes(new_val, 1 TSRMLS_CC); } - php_pgsql_add_quotes(new_val, 1 TSRMLS_CC); break; case IS_LONG: -- 2.40.0