Unicode support

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index d31ca782ce562cab64505046a8a60c8e8598e5a0..1ce4b853eb0777f2cf3cce241e5df131200acc7f 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -864,8 +864,8 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache TS
                        zend_error_noreturn(E_ERROR, "Cannot call abstract method %v::%v()", EX(function_state).function->common.scope->name, EX(function_state).function->common.function_name);
                }
                if (EX(function_state).function->common.fn_flags & ZEND_ACC_DEPRECATED) {
-                       zend_error(E_STRICT, "Function %s%s%s() is deprecated",
-                               EX(function_state).function->common.scope ? EX(function_state).function->common.scope->name.s : "",
+                       zend_error(E_STRICT, "Function %v%s%v() is deprecated",
+                               EX(function_state).function->common.scope ? EX(function_state).function->common.scope->name : (zstr)EMPTY_STR,
                                EX(function_state).function->common.scope ? "::" : "",
                                EX(function_state).function->common.function_name);
                }

diff --git a/Zend/zend_list.c b/Zend/zend_list.c
index 0f1118f54ed4383f19a3e8b0d1acbe6ad098d4f1..7e29a1763df4747ba9a38aaad8857977f4947b7a 100644 (file)
--- a/Zend/zend_list.c
+++ b/Zend/zend_list.c
@@ -121,13 +121,13 @@ ZEND_API void *zend_fetch_resource(zval **passed_id TSRMLS_DC, int default_id, c
                if (!passed_id) {
                        if (resource_type_name) {
                                class_name = get_active_class_name(&space TSRMLS_CC);
-                               zend_error(E_WARNING, "%s%s%s(): no %s resource supplied", class_name, space, get_active_function_name(TSRMLS_C), resource_type_name);
+                               zend_error(E_WARNING, "%v%s%v(): no %s resource supplied", class_name, space, get_active_function_name(TSRMLS_C), resource_type_name);
                        }
                        return NULL;
                } else if (Z_TYPE_PP(passed_id) != IS_RESOURCE) {
                        if (resource_type_name) {
                                class_name = get_active_class_name(&space TSRMLS_CC);
-                               zend_error(E_WARNING, "%s%s%s(): supplied argument is not a valid %s resource", class_name, space, get_active_function_name(TSRMLS_C), resource_type_name);
+                               zend_error(E_WARNING, "%v%s%v(): supplied argument is not a valid %s resource", class_name, space, get_active_function_name(TSRMLS_C), resource_type_name);
                        }
                        return NULL;
                }
@@ -140,7 +140,7 @@ ZEND_API void *zend_fetch_resource(zval **passed_id TSRMLS_DC, int default_id, c
        if (!resource) {
                if (resource_type_name) {
                        class_name = get_active_class_name(&space TSRMLS_CC);
-                       zend_error(E_WARNING, "%s%s%s(): %d is not a valid %s resource", class_name, space, get_active_function_name(TSRMLS_C), id, resource_type_name);
+                       zend_error(E_WARNING, "%v%s%v(): %d is not a valid %s resource", class_name, space, get_active_function_name(TSRMLS_C), id, resource_type_name);
                }
                return NULL;
        }
@@ -159,7 +159,7 @@ ZEND_API void *zend_fetch_resource(zval **passed_id TSRMLS_DC, int default_id, c
 
        if (resource_type_name) {
                class_name = get_active_class_name(&space TSRMLS_CC);
-               zend_error(E_WARNING, "%s%s%s(): supplied resource is not a valid %s resource", class_name, space, get_active_function_name(TSRMLS_C), resource_type_name);
+               zend_error(E_WARNING, "%v%s%v(): supplied resource is not a valid %s resource", class_name, space, get_active_function_name(TSRMLS_C), resource_type_name);
        }
 
        return NULL;