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-04 23:06:19 +02:00
parent d21fb5bf78
commit 554520e955
5 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/engine/Core.php
View File

@@ -114,6 +114,7 @@ class Core
// Init ORM
if (defined('MONSTRA_DB_DSN')) {
require_once(ROOT . '/libraries/engine/Orm.php');
Orm::configure(MONSTRA_DB_DSN);
Orm::configure('username', MONSTRA_DB_USER);
Orm::configure('password', MONSTRA_DB_PASSWORD);
@@ -132,7 +133,7 @@ class Core
// Set cache dir
Cache::configure('cache_dir', CACHE);
// Load URI module
// Load Securitu module
require_once(ROOT . '/libraries/engine/Security.php');
// Load URI module
@@ -180,15 +181,6 @@ class Core
}
/**
* Autoload helpers
*
* @param string $class_name Class name
*/
/*protected static function autoloadHelpers($class_name) {
if (file_exists($path = HELPERS . DS . strtolower($class_name) . '.php')) include $path;
}*/
/**
* Load Defines
*/

0
libraries/monstra/Orm.php → libraries/engine/Orm.php
View File

5
libraries/monstra/Monstra.php
View File

@@ -45,7 +45,7 @@ class Monstra
* @var array
*/
private static $registry = array();
/**
* Autload
*/
@@ -61,7 +61,7 @@ class Monstra
$className = substr($className, $lastNsPos + 1);
$fileName = str_replace('\\', DIRECTORY_SEPARATOR, $namespace) . DIRECTORY_SEPARATOR;
}
$fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
$fileName .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php';
require $path.DIRECTORY_SEPARATOR.$fileName;
}
@@ -114,5 +114,4 @@ class Monstra
return self::$registry[$name];
}
}