Fix bug #3599.

diff --git a/TODO b/TODO
index 4abd32b1a445ae405b0309676e470f651530fc06..084e156f70930f6c459adbc394590d54f521eb2b 100644 (file)
--- a/TODO
+++ b/TODO
@@ -5,8 +5,6 @@ Zend
 ----
     * 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
 ------

diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 1b018f259bbdf1a1e0c7a50356c891594ee8a584..55cc0da7e5edd86521bb571bb9334441cea35431 100644 (file)
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -328,7 +328,7 @@ static void _pcre_match(INTERNAL_FUNCTION_PARAMETERS, int global)
        /* 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;