From 646a875951f253b170c9f4da4b75b8f47b1497c2 Mon Sep 17 00:00:00 2001
From: Claude <longneck@scratchbook.ch>
Date: Sun, 15 Apr 2012 17:28:42 +0200
Subject: [PATCH] db config in stikked-config

---
 htdocs/application/config/database.php | 12 ++++++++----
 htdocs/application/config/stikked.php  | 11 +++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/htdocs/application/config/database.php b/htdocs/application/config/database.php
index 95cfb59..e35b6e5 100644
--- a/htdocs/application/config/database.php
+++ b/htdocs/application/config/database.php
@@ -48,10 +48,14 @@
 $active_group = 'default';
 $active_record = TRUE;
 
-$db['default']['hostname'] = '127.0.0.1';
-$db['default']['username'] = 'stikked';
-$db['default']['password'] = 'stikked';
-$db['default']['database'] = 'stikked';
+$CI =& get_instance();
+$CI->load->config('stikked');
+
+
+$db['default']['hostname'] = $CI->config->item('db_hostname');
+$db['default']['username'] = $CI->config->item('db_username');
+$db['default']['password'] = $CI->config->item('db_password');
+$db['default']['database'] = $CI->config->item('db_database');
 $db['default']['dbdriver'] = 'mysql';
 $db['default']['dbprefix'] = '';
 $db['default']['pconnect'] = TRUE;
diff --git a/htdocs/application/config/stikked.php b/htdocs/application/config/stikked.php
index 89abd29..73ac7ae 100755
--- a/htdocs/application/config/stikked.php
+++ b/htdocs/application/config/stikked.php
@@ -8,6 +8,17 @@
 */
 $config['site_name'] = 'Stikked';
 
+/**
+ * Database connection
+ * 
+ * Credentials for your database
+ *
+*/
+$config['db_hostname'] = '127.0.0.1';
+$config['db_database'] = 'stikked';
+$config['db_username'] = 'stikked';
+$config['db_password'] = 'stikked';
+
 /**
  * Combine JS & CSS files
  *