From: Antony Dovgal <tony2001@php.net>
Date: Sun, 5 Mar 2006 13:35:52 +0000 (+0000)
Subject: MFH: fix #36606 (pg_query_params() changes arguments type to string)
X-Git-Tag: php-5.1.3RC1~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b12f7307eed2ee7cceefe6750e2047607d73714;p=php

MFH: fix #36606 (pg_query_params() changes arguments type to string)
---

diff --git a/NEWS b/NEWS
index 50b8662c8d..c9e0466434 100644
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,7 @@ PHP                                                                        NEWS
 - Fixed tiger hash algorithm generating wrong results on big endian platforms.
   (Mike)
 - Fixed crash with DOMImplementation::createDocumentType("name:"). (Mike)
+- Fixed bug #36606 (pg_query_params() changes arguments type to string). (Tony)
 - Fixed bug #36599 (DATE_W3C format constant incorrect). (Derick)
 - Fixed bug #36575 (SOAP: Incorrect complex type instantiation with
   hierarchies). (Dmitry)
diff --git a/ext/pgsql/pgsql.c b/ext/pgsql/pgsql.c
index c608259193..2617d711c7 100644
--- a/ext/pgsql/pgsql.c
+++ b/ext/pgsql/pgsql.c
@@ -257,7 +257,7 @@ ZEND_GET_MODULE(pgsql)
 
 static int le_link, le_plink, le_result, le_lofp, le_string;
 
-ZEND_DECLARE_MODULE_GLOBALS(pgsql);
+ZEND_DECLARE_MODULE_GLOBALS(pgsql)
 
 /* {{{ _php_pgsql_trim_message */
 static char * _php_pgsql_trim_message(const char *message, int *len)
@@ -1257,7 +1257,7 @@ PHP_FUNCTION(pg_query_params)
 			}
 
 			otype = (*tmp)->type;
-			convert_to_string(*tmp);
+			convert_to_string_ex(tmp);
 			if (Z_TYPE_PP(tmp) != IS_STRING) {
 				php_error_docref(NULL TSRMLS_CC, E_WARNING,"Error converting parameter");
 				_php_pgsql_free_params(params, num_params);