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

types).

diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index 41c3b1f8ee9a32778722029b7f6bfb665d162143..cc1093f31af03510f300d9d5c7b3af04c6818fbf 100644 (file)
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -3789,8 +3789,8 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con
 #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: