diff --git a/includes/preflight.inc b/includes/preflight.inc index 594c865a97..eebd188377 100644 --- a/includes/preflight.inc +++ b/includes/preflight.inc @@ -960,7 +960,7 @@ function drush_preflight_command_dispatch() { */ function drush_preflight_tilde_expansion(&$command) { // Skip tilde expansion for commands that use - // stict option handling, or those that explicitly + // strict option handling, or those that explicitly // turn it off via $command['tilde-expansion'] = FALSE. if ($command['tilde-expansion'] && !$command['strict-option-handling']) { $cli =& drush_get_context('cli'); diff --git a/lib/Drush/Commands/core/StatusCommands.php b/lib/Drush/Commands/core/StatusCommands.php index 9da9982ca8..ede8dc63e5 100644 --- a/lib/Drush/Commands/core/StatusCommands.php +++ b/lib/Drush/Commands/core/StatusCommands.php @@ -226,7 +226,9 @@ public static function pathAliases($options) { } // Add in all of the global paths from $options['path-aliases'] - $paths = array_merge($paths, (array)$options['path-aliases']); + if (isset($options['path-aliases'])) { + $paths = array_merge($paths, $options['path-aliases']); + } return $paths; }