diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Minz/Error.php | 2 | ||||
| -rw-r--r-- | lib/Minz/FrontController.php | 2 | ||||
| -rw-r--r-- | lib/Minz/Log.php | 2 | ||||
| -rw-r--r-- | lib/Minz/Request.php | 2 | ||||
| -rw-r--r-- | lib/Minz/Translate.php | 2 | ||||
| -rw-r--r-- | lib/Minz/View.php | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/lib/Minz/Error.php b/lib/Minz/Error.php index 6af23a566..3eadc6d98 100644 --- a/lib/Minz/Error.php +++ b/lib/Minz/Error.php @@ -83,7 +83,7 @@ class Minz_Error { */ private static function processLogs ($logs) { $conf = Minz_Configuration::get('system'); - $env = $conf->general['environment']; + $env = $conf->environment; $logs_ok = array (); $error = array (); $warning = array (); diff --git a/lib/Minz/FrontController.php b/lib/Minz/FrontController.php index 974cf4260..f9eff3db6 100644 --- a/lib/Minz/FrontController.php +++ b/lib/Minz/FrontController.php @@ -116,7 +116,7 @@ class Minz_FrontController { private function setReporting() { $conf = Minz_Configuration::get('system'); - switch($conf->general['environment']) { + switch($conf->environment) { case 'production': error_reporting(E_ALL); ini_set('display_errors','Off'); diff --git a/lib/Minz/Log.php b/lib/Minz/Log.php index 2063efe7e..2a9e10993 100644 --- a/lib/Minz/Log.php +++ b/lib/Minz/Log.php @@ -33,7 +33,7 @@ class Minz_Log { public static function record ($information, $level, $file_name = null) { try { $conf = Minz_Configuration::get('system'); - $env = $conf->general['environment']; + $env = $conf->environment; } catch (Minz_ConfigurationException $e) { $env = 'production'; } diff --git a/lib/Minz/Request.php b/lib/Minz/Request.php index 5f2f6a858..6db2e9c7a 100644 --- a/lib/Minz/Request.php +++ b/lib/Minz/Request.php @@ -97,7 +97,7 @@ class Minz_Request { */ public static function getBaseUrl() { $conf = Minz_Configuration::get('system'); - $defaultBaseUrl = $conf->general['base_url']; + $defaultBaseUrl = $conf->base_url; if (!empty($defaultBaseUrl)) { return $defaultBaseUrl; } elseif (isset($_SERVER['REQUEST_URI'])) { diff --git a/lib/Minz/Translate.php b/lib/Minz/Translate.php index 7525e95cc..39200e81f 100644 --- a/lib/Minz/Translate.php +++ b/lib/Minz/Translate.php @@ -29,7 +29,7 @@ class Minz_Translate { */ public static function init() { $conf = Minz_Configuration::get('system'); - $l = $conf->general['language']; + $l = $conf->language; self::$lang_name = Minz_Session::param('language', $l); self::$lang_path = APP_PATH . '/i18n/' . self::$lang_name . '/'; } diff --git a/lib/Minz/View.php b/lib/Minz/View.php index 24ad630d0..481b0376d 100644 --- a/lib/Minz/View.php +++ b/lib/Minz/View.php @@ -30,7 +30,7 @@ class Minz_View { Minz_Request::actionName()); $conf = Minz_Configuration::get('system'); - self::$title = $conf->general['title']; + self::$title = $conf->title; } /** |