From: Antony Dovgal <tony2001@php.net>
Date: Thu, 21 Dec 2006 22:50:57 +0000 (+0000)
Subject: temporary fix for oci_error(), just to make it work
X-Git-Tag: RELEASE_1_0_0RC1~565
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=921d845f8d03030e2d23f29f6491bda03aa8cf52;p=php

temporary fix for oci_error(), just to make it work
it should be using add_ascii_assoc_text() instead
---

diff --git a/ext/oci8/oci8_interface.c b/ext/oci8/oci8_interface.c
index 7cc5315c4e..dee6520348 100644
--- a/ext/oci8/oci8_interface.c
+++ b/ext/oci8/oci8_interface.c
@@ -1648,18 +1648,18 @@ PHP_FUNCTION(oci_error)
 
 	if (errcode) {
 		array_init(return_value);
-		add_assoc_long(return_value, "code", errcode);
+		add_ascii_assoc_long(return_value, "code", errcode);
 		if (UG(unicode)) {
-			add_assoc_unicode(return_value, "message", (UChar *)errbuf, 0);
+			add_ascii_assoc_unicode(return_value, "message", (UChar *)errbuf, 0);
 		} else {
 			add_assoc_string(return_value, "message", errbuf, 0);
 		}
 #ifdef HAVE_OCI8_ATTR_STATEMENT
-		add_assoc_long(return_value, "offset", error_offset);
+		add_ascii_assoc_long(return_value, "offset", error_offset);
 		if (sqltext.v) {
-			add_assoc_text(return_value, "sqltext", sqltext, 1);
+			add_ascii_assoc_zstr(return_value, "sqltext", ZEND_STR_TYPE, sqltext, 1); /* XXX */
 		} else {
-			add_assoc_ascii_string(return_value, "sqltext", "", 1);
+			add_ascii_assoc_ascii_string(return_value, "sqltext", "", 1);
 		}
 #endif
 	} else {