diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-09-21 15:56:06 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-09-21 16:15:23 +0200 |
| commit | 398b3083163ea3571345a235a0b7453394ba0a06 (patch) | |
| tree | 408edb4f6dac77c7ffd82fdf35bc7916c6444978 | |
| parent | 0fa13028cb62a3eb9a3bf83607769b0abf5c8633 (diff) | |
| download | php-git-398b3083163ea3571345a235a0b7453394ba0a06.tar.gz | |
Fix #78579: mb_decode_numericentity: args number inconsistency
mb_decode_numericentity() accepts a fourth optional parameter, which is
unused, however. Since this parameter doesn't do any harm, and to avoid
the small BC break, we're keeping this parameter for PHP 7, but adjust
the arginfo.
For PHP 8, we will remove this parameter.
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/mbstring/mbstring.c | 1 |
2 files changed, 5 insertions, 0 deletions
@@ -10,6 +10,10 @@ PHP NEWS . Fixed bug #78442 ('Illegal component' on exif_read_data since PHP7) (Kalle) +- MBString: + . Fixed bug #78579 (mb_decode_numericentity: args number inconsistency). + (cmb) + - Standard: . Fixed bug #76342 (file_get_contents waits twice specified timeout). (Thomas Calvet) diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index c73a427a68..173539f4b8 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -414,6 +414,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_decode_numericentity, 0, 0, 2) ZEND_ARG_INFO(0, string) ZEND_ARG_INFO(0, convmap) ZEND_ARG_INFO(0, encoding) + ZEND_ARG_INFO(0, is_hex) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_send_mail, 0, 0, 3) |