felipe Wed Apr 9 13:47:35 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard reg.c
Log:
Fixed bug #44678 (spliti error message includes wrong function name)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/reg.c?r1=1.82.2.3.2.3&r2=1.82.2.3.2.4&diff_format=u
Index: php-src/ext/standard/reg.c
diff -u php-src/ext/standard/reg.c:1.82.2.3.2.3
php-src/ext/standard/reg.c:1.82.2.3.2.4
--- php-src/ext/standard/reg.c:1.82.2.3.2.3 Mon Dec 31 07:20:13 2007
+++ php-src/ext/standard/reg.c Wed Apr 9 13:47:35 2008
@@ -17,7 +17,7 @@
| Jaakko Hyvätti <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: reg.c,v 1.82.2.3.2.3 2007/12/31 07:20:13 sebastian Exp $ */
+/* $Id: reg.c,v 1.82.2.3.2.4 2008/04/09 13:47:35 felipe Exp $ */
#include <stdio.h>
#include <ctype.h>
@@ -564,7 +564,13 @@
} else if (subs[0].rm_so == 0 && subs[0].rm_eo == 0) {
/* No more matches */
regfree(&re);
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid
Regular Expression to split()");
+
+ if (icase) {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Invalid Regular Expression to spliti()");
+ } else {
+ php_error_docref(NULL TSRMLS_CC, E_WARNING,
"Invalid Regular Expression to split()");
+ }
+
zend_hash_destroy(Z_ARRVAL_P(return_value));
efree(Z_ARRVAL_P(return_value));
RETURN_FALSE;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
