Merge branch 'PHP-5.4' into PHP-5.5

laruence · laruence · commit 69b80a93defc · 2013-02-16T22:29:14.000+08:00
diff --git 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
