From: Antony Dovgal <tony2001@php.net>
Date: Thu, 17 May 2007 17:28:12 +0000 (+0000)
Subject: use zend_make_string_zval(), we want to see the notices
X-Git-Tag: RELEASE_1_2_0~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9bc954147eea0efc6b2e0784d7217a30044806b5;p=php

use zend_make_string_zval(), we want to see the notices
---

diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index e1c9e9e122..3e739f153c 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -1671,7 +1671,7 @@ ZEND_VM_HANDLER(56, ZEND_ADD_VAR, TMP, TMP|VAR|CV)
 	if (opline->extended_value == IS_UNICODE) {
 		zend_make_unicode_zval(var, &var_copy, &use_copy);
 	} else {
-		zend_make_printable_zval(var, &var_copy, &use_copy);
+		zend_make_string_zval(var, &var_copy, &use_copy);
 	}
 	if (use_copy) {
 		var = &var_copy;
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 3c06458da3..f9798f60fe 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -5837,7 +5837,7 @@ static int ZEND_ADD_VAR_SPEC_TMP_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 	if (opline->extended_value == IS_UNICODE) {
 		zend_make_unicode_zval(var, &var_copy, &use_copy);
 	} else {
-		zend_make_printable_zval(var, &var_copy, &use_copy);
+		zend_make_string_zval(var, &var_copy, &use_copy);
 	}
 	if (use_copy) {
 		var = &var_copy;
@@ -6285,7 +6285,7 @@ static int ZEND_ADD_VAR_SPEC_TMP_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 	if (opline->extended_value == IS_UNICODE) {
 		zend_make_unicode_zval(var, &var_copy, &use_copy);
 	} else {
-		zend_make_printable_zval(var, &var_copy, &use_copy);
+		zend_make_string_zval(var, &var_copy, &use_copy);
 	}
 	if (use_copy) {
 		var = &var_copy;
@@ -6827,7 +6827,7 @@ static int ZEND_ADD_VAR_SPEC_TMP_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
 	if (opline->extended_value == IS_UNICODE) {
 		zend_make_unicode_zval(var, &var_copy, &use_copy);
 	} else {
-		zend_make_printable_zval(var, &var_copy, &use_copy);
+		zend_make_string_zval(var, &var_copy, &use_copy);
 	}
 	if (use_copy) {
 		var = &var_copy;