aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan O'Connell <oconn.e@gmail.com>2013-02-09 11:38:06 -0500
committerEvan O'Connell <oconn.e@gmail.com>2013-02-09 11:38:06 -0500
commit41d7bde950d6166a6cc414a48d0fa57f3fd9a512 (patch)
tree403a2638112b0fc25c1f5b5b72ae80b5f6dc0a7e
parente70923c62a7eaaad3c28a0912d270b37b8b75570 (diff)
parent6a994c375c54f1da3f0cfe1b441d17d9d20cc832 (diff)
downloadbayonetcms-41d7bde950d6166a6cc414a48d0fa57f3fd9a512.tar.gz
Merge pull request #2 from eoconnell/master
Fixes Admin Panel Bootstrap
-rw-r--r--.gitignore2
-rw-r--r--admin/index.php18
2 files changed, 14 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index e69de29..99d3b51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.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(