Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6: Fixed bug #64524 Add intl.use_exceptions to php.ini-*
10 years ago · f152c3fa57
2 changed files with 2 additions and 0 deletions
--- a/php.ini-development
+++ b/php.ini-development
@ -954,6 +954,7 @@ cli_server.color = On
 ; happens within intl functions. The value is the level of the error produced.
 ; Default is 0, which does not produce any errors.
 ;intl.error_level = E_WARNING
+;intl.use_exceptions = 0

 [sqlite3]
 ;sqlite3.extension_dir =
--- a/php.ini-production
+++ b/php.ini-production
@ -954,6 +954,7 @@ cli_server.color = On
 ; happens within intl functions. The value is the level of the error produced.
 ; Default is 0, which does not produce any errors.
 ;intl.error_level = E_WARNING
+;intl.use_exceptions = 0

 [sqlite3]
 ;sqlite3.extension_dir =