Skip to content

Commit

Permalink
Issue #1295756 by moshe weitzman | Alan Evans: Drush ignores php item…
Browse files Browse the repository at this point in the history
… in site aliases which specifies the php binary to use.
  • Loading branch information
weitzman authored and weitzman committed Jul 19, 2013
1 parent 654906d commit d3abedc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion examples/example.aliases.drushrc.php
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
* '%files': Path to 'files' directory. This will be looked up if not specified.
* '%root': A reference to the Drupal root defined in the 'root' item
* in the site alias record.
* - 'php': path to custom php interpreter, defaults to /usr/bin/php
* - 'php': path to custom php interpreter. Windows support limited to Cygwin.
* - 'php-options': commandline options for php interpreter, you may
* want to set this to '-d error_reporting="E_ALL^E_DEPRECATED"'
* - 'variables' : An array of name/value pairs which override Drupal variables/config.
Expand Down
5 changes: 3 additions & 2 deletions includes/environment.inc
Original file line number Diff line number Diff line change
Expand Up @@ -616,9 +616,10 @@ function drush_build_drush_command($drush_path = NULL, $php = NULL, $os = NULL,
$additional_options .= ' --php-options=' . drush_escapeshellarg($php_options, $os);
}
}
else {
$php = '';
elseif ($php && drush_has_bash($os)) {
$php = 'DRUSH_PHP=' . drush_escapeshellarg($php, $os) . ' ';
}

return $php . drush_escapeshellarg($drush_path, $os) . $additional_options;
}

Expand Down

0 comments on commit d3abedc

Please sign in to comment.