From: Chad Horohoe <chadh@wikimedia.org>
Date: Mon, 24 Sep 2012 14:43:30 +0000 (-0400)
Subject: Remove some PHP 5.2 cruft (we already bailed for < 5.3.2)
X-Git-Tag: 1.31.0-rc.0~22291^2
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=cd1a039320908eed328047d277e79942534a8844;p=lhc%2Fweb%2Fwiklou.git

Remove some PHP 5.2 cruft (we already bailed for < 5.3.2)

Change-Id: I7057c2e0f389095b9d6191e6fdee0c6ff2f97bd8
---

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();