Changeset 2683

Timestamp:

05/21/2008 12:41:58 PM (6 months ago)

Author:

Shadowhand

Message:

Updated Config:

• Added clear($group) method
  
• Updated load() to handle "core" requests
  
• Changed item() to use load() to load "core"
  
• Changed allow_config_set calls to be logged as errors (was debug)
  

Files:

• trunk/system/core/Config.php (modified) (4 diffs)

trunk/system/core/Config.php

@@ -31 +31 @@
                 if (self::$conf === NULL)
                 {
-                        // Load the application configuration file
-                        require APPPATH.'config/config'.EXT;
-
-                        // Invalid config file
-                        (isset($config) AND is_array($config)) or die
-                        (
-                                'Your Kohana application configuration file is not valid.'
-                        );
-
-                        // Load config into self
-                        self::$conf['core'] = $config;
+                        // Load core configuration
+                        self::$conf['core'] = self::load('core');
 
                         // Re-parse the include paths
@@ -80 +71 @@
                 if (Config::item('core.allow_config_set') == FALSE)
                 {
-                        Log::add('debug', 'Config::set was called, but your configuration file does not allow setting.');
+                        Log::add('error', 'Config::set was called, but your configuration file does not allow setting.');
                         return FALSE;
                 }
@@ -131 +122 @@
 
         /**
+         * Clears a config group from the cached configuration.
+         *
+         * @param   string  config group
+         * @return  TRUE
+         */
+        public function clear($key)
+        {
+                unset(self::$conf[$key]);
+
+                return TRUE;
+        }
+
+        /**
          * Get all include paths.
          *
@@ -168 +172 @@
         public static function load($name, $required = TRUE)
         {
+                if ($name === 'core')
+                {
+                        // Load the application configuration file
+                        include APPPATH.'config/config'.EXT;
+
+                        if (empty($config['site_domain']))
+                        {
+                                // Invalid config file
+                                die('Your Kohana application configuration file is not valid.');
+                        }
+
+                        return $config;
+                }
+
                 $configuration = array();