From: Ilia Alshanetsky Date: Mon, 19 May 2008 15:18:49 +0000 (+0000) Subject: MFB: Fixed bug #45004 (pg_insert() does not accept 4 digit timezone format) X-Git-Tag: BEFORE_HEAD_NS_CHANGE~1726 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8be988a8a46afbc07875f09c0f4705bcccdf197f;p=php MFB: Fixed bug #45004 (pg_insert() does not accept 4 digit timezone format) --- diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c index 74b9b79fd3..01e4a054a8 100644 --- a/ext/pgsql/pgsql.c +++ b/ext/pgsql/pgsql.c @@ -4980,7 +4980,7 @@ PHP_PGSQL_API int php_pgsql_convert(PGconn *pg_link, const char *table_name, con ZVAL_STRINGL(new_val, "NOW()", sizeof("NOW()")-1, 1); } else { /* FIXME: better regex must be used */ - if (php_pgsql_convert_match(Z_STRVAL_PP(val), "^([0-9]{4}[/-][0-9]{1,2}[/-][0-9]{1,2})([ \\t]+(([0-9]{1,2}:[0-9]{1,2}){1}(:[0-9]{1,2}){0,1}(\\.[0-9]+){0,1}([ \\t]*([+-][0-9]{1,2}(:[0-9]{1,2}){0,1}|[-a-zA-Z_/+]{1,50})){0,1})){0,1}$", 1 TSRMLS_CC) == FAILURE) { + if (php_pgsql_convert_match(Z_STRVAL_PP(val), "^([0-9]{4}[/-][0-9]{1,2}[/-][0-9]{1,2})([ \\t]+(([0-9]{1,2}:[0-9]{1,2}){1}(:[0-9]{1,2}){0,1}(\\.[0-9]+){0,1}([ \\t]*([+-][0-9]{1,4}(:[0-9]{1,2}){0,1}|[-a-zA-Z_/+]{1,50})){0,1})){0,1}$", 1 TSRMLS_CC) == FAILURE) { err = 1; } else { ZVAL_STRING(new_val, Z_STRVAL_PP(val), 1);