X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Futils%2FExecutableFinder.php;h=78b3f8e29b3a60c15eda5621edf2d940549e9203;hb=e390198c4e4be7632b01173e42050061f1cc346a;hp=9679bfeeec8d0e1ce9d02392af2d0ab7b331ed52;hpb=bed43f525501ddf80995daa8e406414500ce3d1d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/utils/ExecutableFinder.php b/includes/utils/ExecutableFinder.php
index 9679bfeeec..78b3f8e29b 100644
--- a/includes/utils/ExecutableFinder.php
+++ b/includes/utils/ExecutableFinder.php
@@ -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 ) {