diff options
author | marijus <mario@localhost.localdomain> | 2014-02-02 23:50:21 +0100 |
---|---|---|
committer | marijus <mario@localhost.localdomain> | 2014-02-02 23:50:21 +0100 |
commit | 11efafb5d2b9a6b860772e4c4cec0cde5c1bf248 (patch) | |
tree | 634126be6ba87059f3c12c5b0ff2c98cc52838da /mod/setup.php | |
parent | 211dc4edd2e7c95a88c5905cbcf8a99f35d7b883 (diff) | |
parent | 02e4527de682042562dccac83899ef562c4b1e05 (diff) | |
download | volse-hubzilla-11efafb5d2b9a6b860772e4c4cec0cde5c1bf248.tar.gz volse-hubzilla-11efafb5d2b9a6b860772e4c4cec0cde5c1bf248.tar.bz2 volse-hubzilla-11efafb5d2b9a6b860772e4c4cec0cde5c1bf248.zip |
Merge branch 'master' of https://github.com/friendica/red
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 = ""; |