? includes/table.inc
Index: includes/drush.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/includes/drush.inc,v
retrieving revision 1.82
diff -u -p -r1.82 drush.inc
--- includes/drush.inc	29 Jan 2010 06:14:26 -0000	1.82
+++ includes/drush.inc	31 Jan 2010 18:14:47 -0000
@@ -927,9 +927,6 @@ function drush_do_site_command($site_rec
       if (array_key_exists('%drush-script', $site_record['path-aliases'])) {
         $drush_path = $site_record['path-aliases']['%drush-script'];
       }
-      if (array_key_exists('%drush', $site_record['path-aliases'])) {
-        $drush_path = $site_record['path-aliases']['%drush'] . '/drush';
-      }
     }
     
     $values = drush_backend_invoke_args($command, $args, $data, 'GET', FALSE, $drush_path, array_key_exists('remote-host', $site_record) ? $site_record['remote-host'] : NULL, array_key_exists('remote-user', $site_record) ? $site_record['remote-user'] : NULL);
Index: includes/environment.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/includes/environment.inc,v
retrieving revision 1.72
diff -u -p -r1.72 environment.inc
--- includes/environment.inc	27 Jan 2010 16:29:20 -0000	1.72
+++ includes/environment.inc	31 Jan 2010 18:14:47 -0000
@@ -968,8 +968,9 @@ function drush_valid_db_credentials() {
  * @see DRUSH_COMMAND
  */
 function drush_find_drush() {
- if (drush_get_option(array('php'))) {
-    $drush = drush_get_option(array('php')) . " " . realpath($_SERVER['argv'][0]);
+ $php = drush_get_option('php');
+ if (isset($php)) {
+    $drush = $php . " " . realpath($_SERVER['argv'][0]) . " --php=$php";
   } else {
     $drush = realpath($_SERVER['argv']['0']);
   }
Index: includes/sitealias.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/includes/sitealias.inc,v
retrieving revision 1.16
diff -u -p -r1.16 sitealias.inc
--- includes/sitealias.inc	29 Jan 2010 15:04:28 -0000	1.16
+++ includes/sitealias.inc	31 Jan 2010 18:14:48 -0000
@@ -837,7 +837,7 @@ function drush_sitealias_set_alias_conte
   }
   // Transfer selected path aliases to the drush options.
   if (array_key_exists('path-aliases', $site_alias_settings)) {
-    foreach (array('%drush', '%drush-script', '%dump', '%include') as $key) {
+    foreach (array('%drush-script', '%dump', '%include') as $key) {
       if (array_key_exists($key, $site_alias_settings['path-aliases'])) {
         drush_set_option($prefix . substr($key, 1), $site_alias_settings['path-aliases'][$key], 'alias');
       }