Maintenance: Don't try shelling out if it's disabled
authorKunal Mehta <legoktm@member.fsf.org>
Sun, 24 Jun 2018 21:07:42 +0000 (00:07 +0300)
committerKrinkle <krinklemail@gmail.com>
Mon, 2 Jul 2018 22:15:53 +0000 (22:15 +0000)
Change-Id: Ib30c55aa9e048960f8fa66a41f7e2aa2fa03b253

maintenance/Maintenance.php

index 245bb47..0015bbe 100644 (file)
@@ -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