dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "ProxyLookup: Optimise in_array in isConfiguredProxy()"
[lhc/web/wiklou.git]
/
includes
/
utils
/
ExecutableFinder.php
diff --git
a/includes/utils/ExecutableFinder.php
b/includes/utils/ExecutableFinder.php
index
9679bfe
..
78b3f8e
100644
(file)
--- 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 ) {
* @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 ) {
$paths = self::getPossibleBinPaths();
foreach ( (array)$names as $name ) {
foreach ( $paths as $path ) {