cvs: /php4 TODO /php4/ext/pcre php_pcre.c

andrei Thu Feb 24 06:37:36 2000 EDT Modified files: /php4 TODO /php4/ext/pcre php_pcre.c Log: Fix bug #3599. Index: php4/TODO diff -u php4/TODO:1.48 php4/TODO:1.49 --- php4/TODO:1.48 Sat Feb 19 12:12:26 2000 +++ php4/TODO Thu Feb 24 06:37:05 2000 @@ -5,8 +5,6 @@ ---- * allow foreach ($array as $k => &$val) syntax. right now we can not traverse an array without copying each element. - * create typedefs for all kinds of callback functions - this would make - casting easier. eg: zend_hash_apply(someht,(zend_apply_f) bla); global ------ Index: php4/ext/pcre/php_pcre.c diff -u php4/ext/pcre/php_pcre.c:1.42 php4/ext/pcre/php_pcre.c:1.43 --- php4/ext/pcre/php_pcre.c:1.42 Wed Feb 23 08:38:38 2000 +++ php4/ext/pcre/php_pcre.c Thu Feb 24 06:37:05 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.42 2000/02/23 16:38:38 eschmid Exp $ */ +/* $Id: php_pcre.c,v 1.43 2000/02/24 14:37:05 andrei Exp $ */ /* TODO: @@ -328,7 +328,7 @@ /* Get function parameters and do error-checking. */ switch(ARG_COUNT(ht)) { case 2: - if (zend_get_parameters_ex(2, &regex, &subject) == FAILURE) { + if (global || zend_get_parameters_ex(2, &regex, &subject) == FAILURE) { WRONG_PARAM_COUNT; } break;