summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2013-02-16 22:29:14 +0800
committerXinchen Hui <laruence@php.net>2013-02-16 22:29:14 +0800
commit69b80a93defc23ac3bc9b7e58c04628cc2765f7e (patch)
tree8550981c031c568f584b9e1cc27d885228e41c98
parent75742d57eb34c2c1c4d23d55f9b9ee44939b32c2 (diff)
parent375e3c273b5219e9937c179ed59d551fdce4e540 (diff)
downloadphp-git-69b80a93defc23ac3bc9b7e58c04628cc2765f7e.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
-rw-r--r--ext/mbstring/tests/empty_pattern.phpt2
1 files changed, 0 insertions, 2 deletions
diff --git a/ext/mbstring/tests/empty_pattern.phpt b/ext/mbstring/tests/empty_pattern.phpt
index e395604f8e..10b03309bc 100644
--- a/ext/mbstring/tests/empty_pattern.phpt
+++ b/ext/mbstring/tests/empty_pattern.phpt
@@ -13,6 +13,4 @@ mb_ereg_search_regs();
--EXPECTF--
Warning: mb_ereg_search_init(): Empty pattern in %s on line %d
-Warning: mb_split(): Empty regular expression in %s on line %d
-
Warning: mb_ereg_search_regs(): No regex given in %s on line %d