From addba0a8d3bf3dd28b5d4d8dfe63faf2aa45d618 Mon Sep 17 00:00:00 2001
From: Pepijn Over <pep@neanderthal-technology.com>
Date: Thu, 27 Feb 2014 21:27:37 +0100
Subject: [PATCH] bootstrap: changing version to 2.2.0-dev and adding check
 around the psm_load_conf() to not load in install module

---
 src/bootstrap.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/bootstrap.php b/src/bootstrap.php
index ec7c84db..267b59de 100755
--- a/src/bootstrap.php
+++ b/src/bootstrap.php
@@ -26,7 +26,7 @@
  * @since       phpservermon 2.1.0
  **/
 
-define('PSM_VERSION', '2.1.0');
+define('PSM_VERSION', '2.2.0-dev');
 // Include paths
 define('PSM_PATH_SRC', dirname(__FILE__) . DIRECTORY_SEPARATOR);
 define('PSM_PATH_VENDOR', PSM_PATH_SRC . '..' . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR);
@@ -80,8 +80,7 @@ foreach($includes as $file) {
 // init db connection
 $db = new psm\Service\Database();
 
-if($db->status()) {
-
+if($db->status() && (!defined('PSM_INSTALL') || !PSM_INSTALL)) {
 	psm_load_conf();
 } else {
 	// no config yet! lets help them in the right direction