From 7915f407fceca84a6cd9166199424fc88571dfe7 Mon Sep 17 00:00:00 2001
From: Evan O'Connell <oconn.e@gmail.com>
Date: Thu, 7 Feb 2013 18:43:14 -0500
Subject: Updated igore file

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index e69de29..496ee2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
\ No newline at end of file
-- 
cgit 


From 6a994c375c54f1da3f0cfe1b441d17d9d20cc832 Mon Sep 17 00:00:00 2001
From: Evan O'Connell <oconn.e@gmail.com>
Date: Sat, 9 Feb 2013 11:31:08 -0500
Subject: Fixes bug with bootstrapping the admin panel

- This didn't get changed when config.ini took over
  for config.php
---
 .gitignore      |  3 ++-
 admin/index.php | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 496ee2c..99d3b51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-.DS_Store
\ No newline at end of file
+.DS_Store
+include/config.ini
\ No newline at end of file
diff --git a/admin/index.php b/admin/index.php
index a3cb956..c1da495 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -17,13 +17,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
- 
+
 session_start();
- 
-include '../include/debug.php';
-include '../include/config.php'; 
-include '../include/sql.class.php';
-include '../include/functions.php';
+
+define('BAYONET_INCLUDE', '../include');
+define('BAYONET_CONFIG', '../include/config.ini');
+
+include BAYONET_INCLUDE . '/debug.php';
+include BAYONET_INCLUDE . '/sql.class.php';
+include BAYONET_INCLUDE . '/functions.php';
+require_once BAYONET_INCLUDE . '/classes.php';
+
+Bayonet_Config::init();
+$config = Bayonet_Config::$ini;
 
 $db = new Bayonet_SQL();
 $db->Connect(
-- 
cgit