diff options
| author | marijus <mario@localhost.localdomain> | 2014-02-05 14:48:42 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-02-05 14:48:42 +0100 |
| commit | 419e3b5024efec40c98e48c3bf213c4e60d39fae (patch) | |
| tree | d3754aa1d251308eb6178fe4ab138463ceaaf135 /mod/setup.php | |
| parent | d7d2fff24b05bcb3ff3acc215e99f8f7d33d058d (diff) | |
| parent | 0844110f7b154a0fb5102362fe732c2b091222d7 (diff) | |
| download | volse-hubzilla-419e3b5024efec40c98e48c3bf213c4e60d39fae.tar.gz volse-hubzilla-419e3b5024efec40c98e48c3bf213c4e60d39fae.tar.bz2 volse-hubzilla-419e3b5024efec40c98e48c3bf213c4e60d39fae.zip | |
Merge branch 'master' of https://github.com/friendica/red into upstream
Diffstat (limited to 'mod/setup.php')
| -rwxr-xr-x | mod/setup.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mod/setup.php b/mod/setup.php index ca5566578..14572699e 100755 --- a/mod/setup.php +++ b/mod/setup.php @@ -373,7 +373,10 @@ function check_php(&$phpath, &$checks) { if (strlen($phpath)){ $passed = file_exists($phpath); } else { - $phpath = trim(shell_exec('which php')); + if(is_windows()) + $phpath = trim(shell_exec('where php')); + else + $phpath = trim(shell_exec('which php')); $passed = strlen($phpath); } $help = ""; |