diff options
| -rw-r--r-- | ext/standard/php_string.h | 2 | ||||
| -rw-r--r-- | ext/standard/string.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h index 8deb0883b4..f11fc71095 100644 --- a/ext/standard/php_string.h +++ b/ext/standard/php_string.h @@ -134,7 +134,7 @@ PHPAPI char *php_trim(char *c, int len, char *what, int what_len, zval *return_v PHPAPI size_t php_strip_tags(char *rbuf, int len, int *state, char *allow, int allow_len); PHPAPI int php_char_to_str_ex(char *str, uint len, char from, char *to, int to_len, zval *result, int case_sensitivity, int *replace_count); PHPAPI int php_char_to_str(char *str, uint len, char from, char *to, int to_len, zval *result); -PHPAPI void php_implode(zval *delim, zval *arr, zval *return_value); +PHPAPI void php_implode(zval *delim, zval *arr, zval *return_value TSRMLS_DC); PHPAPI void php_explode(zval *delim, zval *str, zval *return_value, int limit); PHPAPI size_t php_strspn(char *s1, char *s2, char *s1_end, char *s2_end); diff --git a/ext/standard/string.c b/ext/standard/string.c index 62926777d5..f5851fa87d 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -880,7 +880,7 @@ PHP_FUNCTION(explode) /* {{{ php_implode */ -PHPAPI void php_implode(zval *delim, zval *arr, zval *return_value) +PHPAPI void php_implode(zval *delim, zval *arr, zval *return_value TSRMLS_DC) { zval **tmp; HashPosition pos; @@ -888,7 +888,6 @@ PHPAPI void php_implode(zval *delim, zval *arr, zval *return_value) int numelems, i = 0; zval tmp_val; int str_len; - TSRMLS_FETCH(); numelems = zend_hash_num_elements(Z_ARRVAL_P(arr)); @@ -1001,7 +1000,7 @@ PHP_FUNCTION(implode) pos = Z_ARRVAL_P(arr)->pInternalPointer; - php_implode(delim, arr, return_value); + php_implode(delim, arr, return_value TSRMLS_CC); Z_ARRVAL_P(arr)->pInternalPointer = pos; |