oreolek/batufa
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Updated new configuration classes a bit

Browse source
This commit is contained in:
Woody Gilk 2008-12-11 23:38:10 -06:00
parent 1a715e60c6
commit 945f8a1299
2 changed files with 3 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
system/classes/kohana/config.php
View file

@ -55,8 +55,9 @@ class Kohana_Config extends ArrayObject {
{
foreach ($array as $key => $value)
{
if (is_array($value))
if (is_array($value) AND ! isset($value[0]))
{
// Convert all non-numerically indexed arrays to config objects
$array[$key] = new Kohana_Config($value, $this->parent);
}
}
@ -92,36 +93,6 @@ class Kohana_Config extends ArrayObject {
return parent::exchangeArray($this->array_to_config($array));
}
/**
* ArrayObject::offsetExists, forces missing indexes to filled with NULL.
*
* @param string array key name
* @return boolean
*/
public function offsetExists($index)
{
if ( ! parent::offsetExists($index))
{
$this->offsetSet($index, NULL);
}
return TRUE;
}
/**
* ArrayObject::offsetGet, checks if offsets exists before returning them.
*
* @param string array key name
* @return mixed
*/
public function offsetGet($index)
{
// This will force missing values to
$this->offsetExists($index);
return parent::offsetGet($index);
}
/**
* ArrayObject::offsetSet, converts array values to config objects.
*
@ -137,7 +108,7 @@ class Kohana_Config extends ArrayObject {
$newval = $newval->getArrayCopy();
}
if (is_array($newval))
if (is_array($newval) AND ! isset($newval[0]))
{
// Convert the array into a config object
$newval = new Kohana_Config($newval, $this->parent);

2
system/classes/kohana/config/loader.php
View file

@ -13,8 +13,6 @@ class Kohana_Config_Loader_Core extends ArrayObject {
{
if ($config->changed())
{
echo Kohana::debug("$group config was changed during the request");
// Cache the group
Kohana::cache('kohana_config_'.$group, $config->getArrayCopy());
}