felipe Wed Apr 9 13:52:53 2008 UTC Modified files: /php-src/ext/ereg ereg.c Log: MFB: Fixed bug #44678 (spliti error message includes wrong function name) http://cvs.php.net/viewvc.cgi/php-src/ext/ereg/ereg.c?r1=1.91&r2=1.92&diff_format=u Index: php-src/ext/ereg/ereg.c diff -u php-src/ext/ereg/ereg.c:1.91 php-src/ext/ereg/ereg.c:1.92 --- php-src/ext/ereg/ereg.c:1.91 Mon Dec 31 07:12:09 2007 +++ php-src/ext/ereg/ereg.c Wed Apr 9 13:52:53 2008 @@ -17,7 +17,7 @@ | Jaakko Hyvätti <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: ereg.c,v 1.91 2007/12/31 07:12:09 sebastian Exp $ */ +/* $Id: ereg.c,v 1.92 2008/04/09 13:52:53 felipe Exp $ */ #include <stdio.h> #include <ctype.h> @@ -644,7 +644,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