Avoid TSRMLS_FETCH

diff --git a/ext/standard/php_string.h b/ext/standard/php_string.h
index 3d66deaaec382678300664f75662e8f5fbcb7a5e..2f91ce5b18d53782276652bdd11e11424953aeb9 100644 (file)
--- a/ext/standard/php_string.h
+++ b/ext/standard/php_string.h
@@ -147,7 +147,7 @@ PHPAPI int php_u_strip_tags(UChar *rbuf, int len, int *stateptr, UChar *allow, i
 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(char *delim, uint delim_len, char *str, uint str_len, zend_uchar str_type, 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 59a885c90a7f6222f4ffc524e798ad2033933536..800912fb9cdfc938e7dd8332dfff6d286a8494f8 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -1151,13 +1151,12 @@ PHP_FUNCTION(explode)
 
 /* {{{ php_implode
  */
-PHPAPI void php_implode(zval *delim, zval *arr, zval *retval)
+PHPAPI void php_implode(zval *delim, zval *arr, zval *retval TSRMLS_DC)
 {
        zend_uchar              return_type;
        int                             numelems, i=0;
        HashPosition    pos;
        zval                    **tmp;
-       TSRMLS_FETCH();
 
        Z_TYPE_P(retval) = return_type = Z_TYPE_P(delim); /* ... to start off */
 
@@ -1295,7 +1294,7 @@ PHP_FUNCTION(implode)
                }
        }
 
-       php_implode(delim, arr, return_value);
+       php_implode(delim, arr, return_value TSRMLS_DC);
 
        if (argc == 1) {
                FREE_ZVAL(delim);