summaryrefslogtreecommitdiff
path: root/ext/pcre/php_pcre.c
diff options
context:
space:
mode:
authorFelipe Pena <felipe@php.net>2009-03-27 19:28:26 +0000
committerFelipe Pena <felipe@php.net>2009-03-27 19:28:26 +0000
commit04c90a0f510b0524ea1b4151841d41208520a48e (patch)
treeebf20eab8aedcca2b0ba59126d7b2ec27187d055 /ext/pcre/php_pcre.c
parentfe23a6b147175ec35a40053ac362e37c6f6148f0 (diff)
downloadphp-git-04c90a0f510b0524ea1b4151841d41208520a48e.tar.gz
- Removed:
- UG(unicode) checks - Changed: - ZEND_STR_TYPE -> IS_UNICODE - convert_to_text -> convert_to_unicode
Diffstat (limited to 'ext/pcre/php_pcre.c')
-rw-r--r--ext/pcre/php_pcre.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 73d13c21ca..d369f68dc2 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -1437,7 +1437,7 @@ static void preg_replace_impl(INTERNAL_FUNCTION_PARAMETERS, int is_callable_repl
if (is_callable_replace) {
if (Z_TYPE_P(replace) != IS_ARRAY && Z_TYPE_P(replace) != IS_OBJECT) {
- convert_to_text(replace);
+ convert_to_unicode(replace);
}
if (!zend_is_callable(replace, 0, &callback_name TSRMLS_CC)) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Requires argument 2, '%R', to be a valid callback", Z_TYPE(callback_name), Z_UNIVAL(callback_name));