diff options
| author | Evan O'Connell <oconn.e@gmail.com> | 2013-02-09 11:31:08 -0500 |
|---|---|---|
| committer | Evan O'Connell <oconn.e@gmail.com> | 2013-02-09 11:32:50 -0500 |
| commit | 6a994c375c54f1da3f0cfe1b441d17d9d20cc832 (patch) | |
| tree | 403a2638112b0fc25c1f5b5b72ae80b5f6dc0a7e | |
| parent | 7915f407fceca84a6cd9166199424fc88571dfe7 (diff) | |
| download | bayonetcms-6a994c375c54f1da3f0cfe1b441d17d9d20cc832.tar.gz | |
Fixes bug with bootstrapping the admin panel
- This didn't get changed when config.ini took over
for config.php
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | admin/index.php | 18 |
2 files changed, 14 insertions, 7 deletions
@@ -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( |