From e1094f875a4948ecc8da8c9e6574cb19f793ec82 Mon Sep 17 00:00:00 2001 From: Moshe Weitzman Date: Fri, 7 Oct 2016 10:39:27 -0400 Subject: [PATCH] Fix #2379. Canonicalize root in site alias record. --- includes/sitealias.inc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/includes/sitealias.inc b/includes/sitealias.inc index 3a1d1e44e0..1d77c30801 100644 --- a/includes/sitealias.inc +++ b/includes/sitealias.inc @@ -10,6 +10,7 @@ */ use Drush\Log\LogLevel; +use Webmozart\PathUtil\Path; /** * Check to see if the user specified an alias @@ -1259,6 +1260,12 @@ function _drush_sitealias_add_static_defaults(&$alias_record) { if (isset($alias_record['db-url']) && !isset($alias_record['databases'])) { $alias_record['databases'] = drush_sitealias_convert_db_from_db_url($alias_record['db-url']); } + + // Canonicalize paths. + if (!empty($alias_record['root'])) { + $alias_record['root'] = Path::canonicalize($alias_record['root']); + } + // Adjustments for aliases to drupal instances (as opposed to aliases that are site lists) if (array_key_exists('uri', $alias_record)) { // Make sure that there is always a 'path-aliases' array