diff options
| author | Andrea Faulds <ajf@ajf.me> | 2014-09-21 00:29:48 +0100 |
|---|---|---|
| committer | Andrea Faulds <ajf@ajf.me> | 2014-09-21 00:29:48 +0100 |
| commit | 12b15e5ca4ae7ebf6e50551a4c666ece97068074 (patch) | |
| tree | af4eaae6897444c3d8a987d59b695984a26d25d7 /ext/mbstring/php_mbregex.c | |
| parent | 545c296ef4b5ffdb1cf59583c55129f08d75601b (diff) | |
| parent | 6219a4e844e82f8eacd9ad6d24bb92739dcd6ff6 (diff) | |
| download | php-git-12b15e5ca4ae7ebf6e50551a4c666ece97068074.tar.gz | |
Merge branch 'master' into integer_semantics
Diffstat (limited to 'ext/mbstring/php_mbregex.c')
| -rw-r--r-- | ext/mbstring/php_mbregex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index 864d50a5ce..246f2223d1 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ @@ -717,7 +717,7 @@ static void _php_mb_regex_ereg_exec(INTERNAL_FUNCTION_PARAMETERS, int icase) /* don't bother doing an extended regex with just a number */ } - if (!Z_STRVAL_P(arg_pattern) || Z_STRLEN_P(arg_pattern) == 0) { + if (Z_STRLEN_P(arg_pattern) == 0) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "empty pattern"); RETVAL_FALSE; goto out; |