cvs: php4 /ext/standard string.c

stas Tue Sep 12 03:56:25 2000 EDT Modified files: /php4/ext/standard string.c Log: Make parse_str always register globals with 1 argument and never - with 2 arguments Index: php4/ext/standard/string.c diff -u php4/ext/standard/string.c:1.154 php4/ext/standard/string.c:1.155 --- php4/ext/standard/string.c:1.154 Tue Sep 12 03:54:45 2000 +++ php4/ext/standard/string.c Tue Sep 12 03:56:25 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.154 2000/09/12 10:54:45 stas Exp $ */ +/* $Id: string.c,v 1.155 2000/09/12 10:56:25 stas Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -2423,6 +2423,7 @@ zval *sarg; char *res = NULL; int argCount; + int old_rg; PLS_FETCH(); SLS_FETCH(); @@ -2438,19 +2439,19 @@ res = estrndup(sarg->value.str.val, sarg->value.str.len); } - if(argCount == 1) + old_rg = PG(register_globals); + if(argCount == 1) { + PG(register_globals) = 1; php_treat_data(PARSE_STRING, res, NULL ELS_CC PLS_CC SLS_CC); - else - { - int old_rg = PG(register_globals); + } else { PG(register_globals) = 0; /* Clear out the array that was passed in. */ zval_dtor(*arrayArg); array_init(*arrayArg); php_treat_data(PARSE_STRING, res, *arrayArg ELS_CC PLS_CC SLS_CC); - PG(register_globals) = old_rg; } + PG(register_globals) = old_rg; } /* }}} */