From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 13 Oct 2017 19:42:22 +0000 (+0000)
Subject: Merge "Remove old workaround for HHVM"
X-Git-Tag: 1.31.0-rc.0~1780
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=128881c1f19a9c5c476822bde821ae898d0c5887;hp=022dd24850dc3bdb92dc1bb534b1a649fc906fea

Merge "Remove old workaround for HHVM"
---

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 9a29055feb..7de0ae4ccb 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -1470,13 +1470,7 @@ abstract class Maintenance {
 		}
 
 		if ( $isatty && function_exists( 'readline' ) ) {
-			$resp = readline( $prompt );
-			if ( $resp === null ) {
-				// Workaround for https://github.com/facebook/hhvm/issues/4776
-				return false;
-			} else {
-				return $resp;
-			}
+			return readline( $prompt );
 		} else {
 			if ( $isatty ) {
 				$st = self::readlineEmulation( $prompt );