From 1ee8f2a206337af0c910400444c312d354cd4dea Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Thu, 27 Sep 2012 19:36:15 +0200
Subject: fix elasticsearch setup check that was broken by jnovack

---
 src/phorkie/SetupCheck.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/phorkie/SetupCheck.php')

diff --git a/src/phorkie/SetupCheck.php b/src/phorkie/SetupCheck.php
index f1fbc0f..95fd759 100644
--- a/src/phorkie/SetupCheck.php
+++ b/src/phorkie/SetupCheck.php
@@ -32,9 +32,7 @@ class SetupCheck
         $sc->checkDeps();
         $sc->checkDirs();
         $sc->checkGit();
-        if ($this->elasticsearch != '') {
-            $sc->checkDatabase();
-        }
+        $sc->checkDatabase();
     }
 
     public function checkDeps()
@@ -76,6 +74,10 @@ class SetupCheck
 
     public function checkDatabase()
     {
+        if ($this->elasticsearch != '') {
+            return;
+        }
+
         $es = parse_url($this->elasticsearch);
         if (!preg_match("#/.+/#", $es['path'], $matches)) {
             $this->fail('Improper elasticsearch url.  Elasticsearch requires a'
-- 
cgit v1.2.3