Merge remote branch 'dlsniper/fix_open_basedir'

* dlsniper/fix_open_basedir:
  Fix problem with searching files while the open_basedir is in use
This commit is contained in:
Fabien Potencier 2011-06-07 22:15:07 +02:00
commit 0d54f5c21e

View File

@ -41,7 +41,7 @@ class ExecutableFinder
*/
public function find($name, $default = null)
{
$dirs = explode(PATH_SEPARATOR, getenv('PATH') ? getenv('PATH') : getenv('Path'));
$dirs = explode(PATH_SEPARATOR, ini_get('open_basedir') ? ini_get('open_basedir') : (getenv('PATH') ? getenv('PATH') : getenv('Path')));
$suffixes = DIRECTORY_SEPARATOR == '\\' ? (getenv('PATHEXT') ? explode(PATH_SEPARATOR, getenv('PATHEXT')) : $this->suffixes) : array('');
foreach ($suffixes as $suffix) {
foreach ($dirs as $dir) {