Re: cvs: php4 /ext/standard string.c
| From: | Andrei Zmievski | Date: | Fri, 18 Aug 2000 13:24:38 +0000 |
| Subject: | Re: cvs: php4 /ext/standard string.c | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-1219@lists.php.net to get a copy of this message | ||
On Fri, 18 Aug 2000, Sterling Hughes wrote:
> sterling Fri Aug 18 06:22:09 2000 EDT
>
> Modified files:
> /php4/ext/standard string.c
> Log:
> Fix #6234
>
>
>
> Index: php4/ext/standard/string.c
> diff -u php4/ext/standard/string.c:1.144 php4/ext/standard/string.c:1.145
> --- php4/ext/standard/string.c:1.144 Thu Aug 17 01:47:42 2000
> +++ php4/ext/standard/string.c Fri Aug 18 06:22:09 2000
> @@ -18,7 +18,7 @@
> +----------------------------------------------------------------------+
> */
>
> -/* $Id: string.c,v 1.144 2000/08/17 08:47:42 stas Exp $ */
> +/* $Id: string.c,v 1.145 2000/08/18 13:22:09 sterling Exp $ */
>
> /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
>
> @@ -487,6 +487,7 @@
> if ((*arg1)->type == IS_ARRAY && (*arg2)->type == IS_STRING) {
> SEPARATE_ZVAL(arg1);
> arr = *arg1;
> + convert_to_string_ex(arg2);
> delim = *arg2;
> } else if ((*arg2)->type == IS_ARRAY) {
> SEPARATE_ZVAL(arg2)
That's superfluous since arg2 is checked for being IS_STRING already.
-Andrei
* If it ain't broken, it doesn't have enough features yet. *