Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed bug in config has method.

This commit is contained in:
Taylor Otwell 2011-07-26 22:56:51 -05:00
parent 0f1bd8a739
commit 7e439ab52e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
system/config.php
View File

@ -7,7 +7,7 @@ class Config {
* *
* @var array * @var array
*/ */
private static $items = array(); public static $items = array();
/** /**
* Determine if a configuration item or file exists. * Determine if a configuration item or file exists.
@ -112,7 +112,10 @@ public static function load($file)
$config = array_merge($config, require $path); $config = array_merge($config, require $path);
} }
return static::$items[$file] = $config; if (count($config) > 0)
{
static::$items[$file] = $config;
}
} }
} }

1
system/db/query.php
View File

@ -413,7 +413,6 @@ public function find($id, $columns = array('*'))
*/ */
public function first($columns = array('*')) public function first($columns = array('*'))
{ {
return (count($results = $this->take(1)->get($columns)) > 0) ? $results[0] : null; return (count($results = $this->take(1)->get($columns)) > 0) ? $results[0] : null;
} }