- Unicode support

diff --git a/ext/spl/spl_engine.h b/ext/spl/spl_engine.h
index 6c6ed4c4a86b39d2b674a76a4bb8e797d5be6663..d331907a3a3382cbf6a46ba0cd5204caac1f0de5 100755 (executable)
--- a/ext/spl/spl_engine.h
+++ b/ext/spl/spl_engine.h
@@ -24,6 +24,7 @@
 #include "php.h"
 #include "php_spl.h"
 #include "zend_interfaces.h"
+#include "zend_unicode.h"
 
 /* {{{ zend_class_entry */
 static inline zend_class_entry *spl_get_class_entry(zval *obj TSRMLS_DC)
@@ -43,8 +44,7 @@ static inline int spl_instantiate_arg_ex1(zend_class_entry *pce, zval **retval,
 {
        spl_instantiate(pce, retval, alloc TSRMLS_CC);
 
-       /* FIXME: Unicode support??? */
-       zend_call_method(retval, pce, &pce->constructor, pce->constructor->common.function_name.s, strlen(pce->constructor->common.function_name.s), NULL, 1, arg1, NULL TSRMLS_CC);
+       zend_u_call_method(retval, pce, &pce->constructor, ZEND_STR_TYPE, pce->constructor->common.function_name, USTR_LEN(pce->constructor->common.function_name), NULL, 1, arg1, NULL TSRMLS_CC);
        return 0;
 }
 /* }}} */
@@ -54,8 +54,7 @@ static inline int spl_instantiate_arg_ex2(zend_class_entry *pce, zval **retval,
 {
        spl_instantiate(pce, retval, alloc TSRMLS_CC);
        
-       /* FIXME: Unicode support??? */
-       zend_call_method(retval, pce, &pce->constructor, pce->constructor->common.function_name.s, strlen(pce->constructor->common.function_name.s), NULL, 2, arg1, arg2 TSRMLS_CC);
+       zend_u_call_method(retval, pce, &pce->constructor, ZEND_STR_TYPE, pce->constructor->common.function_name, USTR_LEN(pce->constructor->common.function_name), NULL, 2, arg1, arg2 TSRMLS_CC);
        return 0;
 }
 /* }}} */