mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-07-31 18:30:20 +02:00
Code Issues Releases Wiki Activity

Core Improvements: Next Round #79 #80

Browse Source
This commit is contained in:
Awilum
2013-01-08 23:16:41 +02:00
parent b4438b5440
commit 7552b2aee5
5 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
engine/Monstra.php
View File

@@ -154,6 +154,9 @@ class Monstra
// Shortcode API
'Shortcode' => ROOT . DS .'engine'. DS .'Shortcode.php',
// Idiorm
'ORM' => ROOT . DS .'libraries'. DS . 'Idiorm'. DS .'ORM.php',
));
/**
@@ -165,10 +168,9 @@ class Monstra
* Init Idiorm
*/
if (defined('MONSTRA_DB_DSN')) {
require_once ROOT . DS . 'libraries'. DS .'Idiorm'. DS .'Idiorm.php';
Orm::configure(MONSTRA_DB_DSN);
Orm::configure('username', MONSTRA_DB_USER);
Orm::configure('password', MONSTRA_DB_PASSWORD);
ORM::configure(MONSTRA_DB_DSN);
ORM::configure('username', MONSTRA_DB_USER);
ORM::configure('password', MONSTRA_DB_PASSWORD);
}
/**
@@ -227,7 +229,7 @@ class Monstra
/**
* Init site module
*/
if( ! BACKEND) Site::init();
if ( ! BACKEND) Site::init();
}
/**