diff options
| author | Nikita Popov <nikic@php.net> | 2014-07-02 22:35:19 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-07-02 22:35:19 +0200 |
| commit | 2d4d36d2a0423c8da3b0cebf88cbcdcceb8380d2 (patch) | |
| tree | cf941b04c2733af1cea8e6c50719f5024f975c46 | |
| parent | 46055f8e99234a2da9c85db1d37ae6ae0e294466 (diff) | |
| parent | 4827806b9e0203d4babead05daeb1a25d67fb832 (diff) | |
| download | php-git-2d4d36d2a0423c8da3b0cebf88cbcdcceb8380d2.tar.gz | |
Merge branch 'PHP-5.6'
| -rw-r--r-- | ext/standard/string.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index 9139906653..9aa7c637f9 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -3101,6 +3101,10 @@ static void php_strtr_array(zval *return_value, char *str, int slen, HashTable * int patterns_len; zend_llist *allocs; + if (zend_hash_num_elements(pats) == 0) { + RETURN_STRINGL(str, slen, 1); + } + S(&text) = str; L(&text) = slen; |