From cd1a039320908eed328047d277e79942534a8844 Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Mon, 24 Sep 2012 10:43:30 -0400 Subject: [PATCH] Remove some PHP 5.2 cruft (we already bailed for < 5.3.2) Change-Id: I7057c2e0f389095b9d6191e6fdee0c6ff2f97bd8 --- maintenance/Maintenance.php | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php index 4151723797..c00d7a673a 100644 --- a/maintenance/Maintenance.php +++ b/maintenance/Maintenance.php @@ -482,19 +482,11 @@ abstract class Maintenance { $this->error( 'Cannot get command line arguments, register_argc_argv is set to false', true ); } - if ( version_compare( phpversion(), '5.2.4' ) >= 0 ) { - // Send PHP warnings and errors to stderr instead of stdout. - // This aids in diagnosing problems, while keeping messages - // out of redirected output. - if ( ini_get( 'display_errors' ) ) { - ini_set( 'display_errors', 'stderr' ); - } - - // Don't touch the setting on earlier versions of PHP, - // as setting it would disable output if you'd wanted it. - - // Note that exceptions are also sent to stderr when - // command-line mode is on, regardless of PHP version. + // Send PHP warnings and errors to stderr instead of stdout. + // This aids in diagnosing problems, while keeping messages + // out of redirected output. + if ( ini_get( 'display_errors' ) ) { + ini_set( 'display_errors', 'stderr' ); } $this->loadParamsAndArgs(); -- 2.20.1