From: Kunal Mehta <legoktm@member.fsf.org>
Date: Sun, 24 Jun 2018 21:07:42 +0000 (+0300)
Subject: Maintenance: Don't try shelling out if it's disabled
X-Git-Tag: 1.34.0-rc.0~4893
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=6849ebc7d13bfaf3d2072a47eb84c3d3ea266f96;p=lhc%2Fweb%2Fwiklou.git

Maintenance: Don't try shelling out if it's disabled

Change-Id: Ib30c55aa9e048960f8fa66a41f7e2aa2fa03b253
---

diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 245bb47399..0015bbeab0 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -1606,6 +1606,9 @@ abstract class Maintenance {
 		if ( wfIsWindows() ) {
 			return $default;
 		}
+		if ( Shell::isDisabled() ) {
+			return $default;
+		}
 		// It's possible to get the screen size with VT-100 terminal escapes,
 		// but reading the responses is not possible without setting raw mode
 		// (unless you want to require the user to press enter), and that