Fix support for HTTP/2 in MultiHttpClient

[lhc/web/wiklou.git] / includes / utils / ExecutableFinder.php

diff --git a/includes/utils/ExecutableFinder.php b/includes/utils/ExecutableFinder.php
index 93f635d..78b3f8e 100644 (file)
--- a/includes/utils/ExecutableFinder.php
+++ b/includes/utils/ExecutableFinder.php
@@ -62,9 +62,9 @@ class ExecutableFinder {
        protected static function findExecutable( $path, $name, $versionInfo = false ) {
                $command = $path . DIRECTORY_SEPARATOR . $name;
 
-               MediaWiki\suppressWarnings();
+               Wikimedia\suppressWarnings();
                $file_exists = is_executable( $command );
-               MediaWiki\restoreWarnings();
+               Wikimedia\restoreWarnings();
 
                if ( $file_exists ) {
                        if ( !$versionInfo ) {
@@ -94,6 +94,11 @@ class ExecutableFinder {
         * @return bool|string
         */
        public static function findInDefaultPaths( $names, $versionInfo = false ) {
+               if ( Shell::isDisabled() ) {
+                       // If we can't shell out, there's no point looking for executables
+                       return false;
+               }
+
                $paths = self::getPossibleBinPaths();
                foreach ( (array)$names as $name ) {
                        foreach ( $paths as $path ) {