Merge branch 'develop'

district09 · Dec 1, 2017 · 6419dd5 · 6419dd5
2 parents 03bef0e + 445987c
commit 6419dd5
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/RoboFileBase.php b/src/RoboFileBase.php
@@ -42,16 +42,15 @@ protected function isSiteInstalled($worker, AbstractAuth $auth, $remote)
             return $this->siteInstalled;
         }
         $currentWebRoot = $remote['currentdir'];
-        $self = $this;
+        $tables = array();
         $result = $this->taskSsh($worker, $auth)
             ->remoteDirectory($currentWebRoot, true)
-            ->exec('../vendor/bin/drush sql-query "SHOW TABLES"', function ($output) use ($self) {
-                $tables = array_filter(explode("\n", $output));
-                $self->setSiteInstalled(count($tables) > 10);
+            ->exec('../vendor/bin/drush sql-query "SHOW TABLES"', function ($output) use (&$tables) {
+                $tables = array_merge($tables, array_filter(explode("\n", $output)));
             })
             ->timeout(300)
             ->run();
-        $this->setSiteInstalled($result->wasSuccessful() && $this->siteInstalled);
+        $this->setSiteInstalled($result->wasSuccessful() && count($tables) > 10);
         return $this->siteInstalled;
     }