Use uri from an alias when that alias has no root. (#3241)

drush-ops · Dec 13, 2017 · 8ac98b8 · 8ac98b8
1 parent a765db4
commit 8ac98b8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/Application.php b/src/Application.php
@@ -154,7 +154,7 @@ public function refineUriSelection($cwd)
             return;
         }
         $selfAliasRecord = $this->aliasManager->getSelf();
-        if (!$selfAliasRecord->hasRoot()) {
+        if (!$selfAliasRecord->hasRoot() && !$this->bootstrapManager()->drupalFinder()->getDrupalRoot()) {
             return;
         }
         $uri = $selfAliasRecord->uri();

diff --git a/src/Preflight/Preflight.php b/src/Preflight/Preflight.php
@@ -317,11 +317,13 @@ protected function findSelectedSite()
      */
     protected function setSelectedSite($selectedRoot, $fallbackPath = false)
     {
-        $foundRoot = $this->drupalFinder->locateRoot($selectedRoot);
-        if (!$foundRoot && $fallbackPath) {
-            $this->drupalFinder->locateRoot($fallbackPath);
+        if ($selectedRoot || $fallbackPath) {
+            $foundRoot = $this->drupalFinder->locateRoot($selectedRoot);
+            if (!$foundRoot && $fallbackPath) {
+                $this->drupalFinder->locateRoot($fallbackPath);
+            }
+            return $this->drupalFinder()->getDrupalRoot();
         }
-        return $this->drupalFinder()->getDrupalRoot();
     }
 
     /**