MFH: Fixed Bug #26625 (pg_convert sets NULL incorrectly for character data

types).

diff --git a/NEWS b/NEWS
index a355c8bfbcabae05df60ead215ba08f3f08e44c1..d1fd51621f5c30e80b6103b8835a883d28a34805 100644 (file)
--- 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 e34ecebb6f22057536ef144775be9678a2909c22..49b906e9f228cc66bbbaa071804e241e3fcf76bc 100644 (file)
--- 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: