summaryrefslogtreecommitdiff
path: root/ext/mbstring/php_mbregex.c
diff options
context:
space:
mode:
authorChristoph M. Becker <cmb@php.net>2016-07-28 13:18:18 +0200
committerChristoph M. Becker <cmb@php.net>2016-07-28 13:19:15 +0200
commitdb69ea32cb283641eba86742de36d7eb9bd485ea (patch)
treeea4336b5ce3cc75a0e22648040c31d0ef8fc5125 /ext/mbstring/php_mbregex.c
parent2e9b6a0aed4ba231e3157686de9ee2fec77d06e2 (diff)
parent18a37eeeece3c8ff88a5c9fff0bc3871cbe37c17 (diff)
downloadphp-git-db69ea32cb283641eba86742de36d7eb9bd485ea.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'ext/mbstring/php_mbregex.c')
-rw-r--r--ext/mbstring/php_mbregex.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c
index a012ee2f35..a361874729 100644
--- a/ext/mbstring/php_mbregex.c
+++ b/ext/mbstring/php_mbregex.c
@@ -1271,9 +1271,6 @@ _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAMETERS, int mode)
php_error_docref(NULL, E_WARNING, "mbregex search failure in mbregex_search(): %s", err_str);
RETVAL_FALSE;
} else {
- if (MBREX(search_regs)->beg[0] == MBREX(search_regs)->end[0]) {
- php_error_docref(NULL, E_WARNING, "Empty regular expression");
- }
switch (mode) {
case 1:
array_init(return_value);