com php-src: Fixed type (case sensetive/insensetive mess): ext/standard/string.c

Commit: a7ce679578dd630946c54becc2b2175151424a67 Author: Dmitry Stogov <dmitry@zend.com> Mon, 12 Jan 2015 22:30:55 +0300 Parents: c5047d1f11318a8613155c886cdb089deb52c5fb Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a7ce679578dd630946c54becc2b2175151424a67 Log: Fixed type (case sensetive/insensetive mess) Changed paths: M ext/standard/string.c Diff: diff --git a/ext/standard/string.c b/ext/standard/string.c index c377cae..8b4c6dd 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -3078,8 +3078,6 @@ PHP_FUNCTION(strtr) if (zend_hash_num_elements(pats) < 1) { RETURN_STR(zend_string_copy(str)); -//... -#if 1 } else if (zend_hash_num_elements(pats) == 1) { zend_long num_key; zend_string *str_key, *replace; @@ -3102,18 +3100,17 @@ PHP_FUNCTION(strtr) replace->val, replace->len, return_value, - 0, + 1, NULL); } else { RETVAL_STR(php_str_to_str_ex(str->val, str->len, str_key->val, str_key->len, - replace->val, replace->len, 0, NULL)); + replace->val, replace->len, 1, NULL)); } zend_string_release(replace); zval_dtor(&tmp); return; } ZEND_HASH_FOREACH_END(); -#endif } else { php_strtr_array(return_value, str->val, str->len, pats); }