diff options
| author | Felipe Pena <felipe@php.net> | 2010-09-27 23:09:00 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2010-09-27 23:09:00 +0000 |
| commit | 2cd1661e2d8a87bf900dae6f60c66811cfa3600a (patch) | |
| tree | c8b7451a150ff09f62d0a020a3d54a29d6940931 /ext/mbstring | |
| parent | 761cc3005589c6f294f511aca2115df5dfd63a62 (diff) | |
| download | php-git-2cd1661e2d8a87bf900dae6f60c66811cfa3600a.tar.gz | |
- Fixed bug #52931 (strripos not overloaded with function overloading enabled)
Diffstat (limited to 'ext/mbstring')
| -rw-r--r-- | ext/mbstring/mbstring.c | 2 | ||||
| -rw-r--r-- | ext/mbstring/tests/bug52931.phpt | 22 |
2 files changed, 23 insertions, 1 deletions
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c index ef11db31a3..f67d0fb569 100644 --- a/ext/mbstring/mbstring.c +++ b/ext/mbstring/mbstring.c @@ -196,7 +196,7 @@ static const struct mb_overload_def mb_ovld[] = { {MB_OVERLOAD_STRING, "strpos", "mb_strpos", "mb_orig_strpos"}, {MB_OVERLOAD_STRING, "strrpos", "mb_strrpos", "mb_orig_strrpos"}, {MB_OVERLOAD_STRING, "stripos", "mb_stripos", "mb_orig_stripos"}, - {MB_OVERLOAD_STRING, "strripos", "mb_strripos", "mb_orig_stripos"}, + {MB_OVERLOAD_STRING, "strripos", "mb_strripos", "mb_orig_strripos"}, {MB_OVERLOAD_STRING, "strstr", "mb_strstr", "mb_orig_strstr"}, {MB_OVERLOAD_STRING, "strrchr", "mb_strrchr", "mb_orig_strrchr"}, {MB_OVERLOAD_STRING, "stristr", "mb_stristr", "mb_orig_stristr"}, diff --git a/ext/mbstring/tests/bug52931.phpt b/ext/mbstring/tests/bug52931.phpt new file mode 100644 index 0000000000..9669d884cb --- /dev/null +++ b/ext/mbstring/tests/bug52931.phpt @@ -0,0 +1,22 @@ +--TEST-- +Bug #52931 (strripos not overloaded with function overloading enabled) +--INI-- +mbstring.func_overload = 7 +mbstring.internal_encoding = utf-8 +--FILE-- +<?php + +$string = '<body>Umlauttest öüä</body>'; + +var_dump(strlen($string)); +var_dump(mb_strlen($string)); + +var_dump(strripos($string, '</body>')); +var_dump(mb_strripos($string, '</body>')); + +?> +--EXPECTF-- +int(27) +int(27) +int(20) +int(20) |