Merge Stas's 5.4 r323128 to trunk

diff --git a/php.ini-development b/php.ini-development
index e6a0f6dcc113ea2c1ef836ff4eb860948acd73f3..a9b12d5f97e2466bf28265f8d99e86ae46e3ebd8 100644 (file)
--- a/php.ini-development
+++ b/php.ini-development
@@ -424,7 +424,7 @@ memory_limit = 128M
 ; development and early testing.
 ;
 ; Error Level Constants:
-; E_ALL             - All errors and warnings (includes E_STRICT as of PHP 6.0.0)
+; E_ALL             - All errors and warnings (includes E_STRICT as of PHP 5.4.0)
 ; E_ERROR           - fatal run-time errors
 ; E_RECOVERABLE_ERROR  - almost fatal run-time errors
 ; E_WARNING         - run-time warnings (non-fatal errors)

diff --git a/php.ini-production b/php.ini-production
index 5a1052fcfea9479bfe4cc28ae4d3be7efc96f02d..b76b8bacb237b45583ef034e31aa429d90fa9717 100644 (file)
--- a/php.ini-production
+++ b/php.ini-production
@@ -424,7 +424,7 @@ memory_limit = 128M
 ; development and early testing.
 ;
 ; Error Level Constants:
-; E_ALL             - All errors and warnings (includes E_STRICT as of PHP 6.0.0)
+; E_ALL             - All errors and warnings (includes E_STRICT as of PHP 5.4.0)
 ; E_ERROR           - fatal run-time errors
 ; E_RECOVERABLE_ERROR  - almost fatal run-time errors
 ; E_WARNING         - run-time warnings (non-fatal errors)