diff --git a/engine/Monstra.php b/engine/Monstra.php index ec4994f..5f97605 100644 --- a/engine/Monstra.php +++ b/engine/Monstra.php @@ -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(); } /** diff --git a/libraries/Gelato/ErrorHandler/Resources/Views/Errors/exception.php b/libraries/Gelato/ErrorHandler/Resources/Views/Errors/exception.php index d07ffce..81d72c0 100644 --- a/libraries/Gelato/ErrorHandler/Resources/Views/Errors/exception.php +++ b/libraries/Gelato/ErrorHandler/Resources/Views/Errors/exception.php @@ -28,7 +28,7 @@ #gelato-error td {font-size:14px;background:#fff;border-color: #ddd;border-width: 1px 1px 0 0;border-style: solid;margin: 0;padding: 4px;} .pull-right {float: right;} - +
diff --git a/libraries/Gelato/ErrorHandler/Resources/Views/Errors/production.php b/libraries/Gelato/ErrorHandler/Resources/Views/Errors/production.php index e65bff0..657ae34 100644 --- a/libraries/Gelato/ErrorHandler/Resources/Views/Errors/production.php +++ b/libraries/Gelato/ErrorHandler/Resources/Views/Errors/production.php @@ -4,8 +4,7 @@ Error diff --git a/libraries/Gelato/README.md b/libraries/Gelato/README.md index f762436..0219d83 100644 --- a/libraries/Gelato/README.md +++ b/libraries/Gelato/README.md @@ -6,4 +6,4 @@ Gelato is a PHP5 library for kickass Web Applications. - [Site](http://gelato.monstra.org) - [Github Repository](https://github.com/Monstra/gelato-library) -Copyright (C) 2013 Romanenko Sergey / Awilum [awilum@msn.com] \ No newline at end of file +Copyright (C) 2012-2013 Romanenko Sergey / Awilum [awilum@msn.com] \ No newline at end of file diff --git a/libraries/Idiorm/Idiorm.php b/libraries/Idiorm/ORM.php similarity index 99% rename from libraries/Idiorm/Idiorm.php rename to libraries/Idiorm/ORM.php index df404a8..fdd8899 100644 --- a/libraries/Idiorm/Idiorm.php +++ b/libraries/Idiorm/ORM.php @@ -38,7 +38,7 @@ * */ -class orm +class ORM { // ----------------------- // // --- CLASS CONSTANTS --- //