Changeset 1400

Timestamp:

12/03/2007 02:49:54 PM (10 months ago)

Author:

Geert

Message:

• Pagination library loads configuration values via Config::item() now. Config::load() won't statically store the values already.
  
• Cache library now merges configuration values from file and constructor parameter.
  

Location:

trunk/system/libraries

Files:

• Cache.php (modified) (2 diffs)
• Pagination.php (modified) (1 diff)

trunk/system/libraries/Cache.php

@@ -32 +32 @@
         {
                 // Load configuration
-                $this->config = empty($config) ? Config::item('cache') : $config;
+                $this->config = array_merge(Config::item('cache'), (array) $config);
 
                 try
@@ -54 +54 @@
                         throw new Kohana_Exception('cache.driver_not_supported', 'Cache drivers must use the Cache_Driver interface.');
 
-                Log::add('debug', 'Cache Library initialized.');
+                Log::add('debug', 'Cache Library initialized');
 
                 if (self::$loaded != TRUE)

trunk/system/libraries/Pagination.php

@@ -37 +37 @@
         public function __construct($config = array())
         {
-                // Merge all pagination config values
-                $config = array_merge(Config::load('pagination', FALSE), (array) $config);
+                // Load configuration
+                $config = array_merge(Config::item('pagination', FALSE, FALSE), (array) $config);
 
                 $this->initialize($config);