From 8f58146854932afb332fbd7309cbf6eaa0a46584 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <info@steffenvogel.de>
Date: Sat, 24 Jul 2010 13:06:34 +0200
Subject: [PATCH] fixed bug while loading configuration

---
 backend/bin/doctrine.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/backend/bin/doctrine.php b/backend/bin/doctrine.php
index 2425398..ffb888f 100644
--- a/backend/bin/doctrine.php
+++ b/backend/bin/doctrine.php
@@ -24,6 +24,8 @@
  * along with volkszaehler.org. If not, see <http://www.gnu.org/licenses/>.
  */
 
+use Volkszaehler\Util;
+
 // TODO replace by state class
 const BACKEND_DIR = '/home/steffen/workspace/volkszaehler.org/backend';
 const DEV_ENV = TRUE;
@@ -41,12 +43,7 @@ foreach ($classLoaders as $loader) {
 }
 
 // load configuration
-if (!file_exists(BACKEND_DIR . '/volkszaehler.conf.php')) {
-	throw new Exception('No configuration available! Use volkszaehler.conf.default.php as an template');
-}
-else {
-	Util\Configuration::load(BACKEND_DIR . '/volkszaehler.conf.php');
-}
+Util\Configuration::load(BACKEND_DIR . '/volkszaehler.conf');
 
 $em = Volkszaehler\Dispatcher::createEntityManager();