Changeset 3210

Timestamp:

07/27/2008 05:37:49 AM (4 months ago)

Author:

Geert

Message:

Follow-up to r3160. Re-added support for non-required config files/items.

Location:

trunk/system

Files:

• core/Kohana.php (modified) (4 diffs)
• i18n/en_US/core.php (modified) (1 diff)

trunk/system/core/Kohana.php

@@ -373 +373 @@
          * @return  mixed
          */
-        public static function config($key, $slash = FALSE)
+        public static function config($key, $slash = FALSE, $required = TRUE)
         {
                 if (self::$configuration === NULL)
@@ -391 +391 @@
                 {
                         // Load the configuration group
-                        self::$configuration[$group] = self::config_load($group);
+                        self::$configuration[$group] = self::config_load($group, $required);
                 }
 
@@ -465 +465 @@
          *
          * @param   string   config filename, without extension
+         * @param   boolean  is the file required?
          * @return  array
          */
-        public static function config_load($name)
+        public static function config_load($name, $required = TRUE)
         {
                 if ($name === 'core')
@@ -489 +490 @@
                 $configuration = array();
 
-                if ($files = self::find_file('config', $name, TRUE))
+                if ($files = self::find_file('config', $name, $required))
                 {
                         foreach ($files as $file)

trunk/system/i18n/en_US/core.php

@@ -26 +26 @@
 
         // Resource names
+        'config'                => 'config file',
         'controller'            => 'controller',
         'helper'                => 'helper',