archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.6' into PHP-7.0

Browse source 
# Resolved conflicts:
#	ext/mbstring/php_mbregex.c
This commit is contained in:
Christoph M. Becker 2016-07-28 13:09:09 +02:00
commit 18a37eeeec
3 changed files with 52 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ext/mbstring/php_mbregex.c
View file

@ -1246,9 +1246,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);