Skip to content
Browse files

Updating for new config system

  • Loading branch information...
1 parent 13e79da commit f7ce165c8eaacabaa455675239656d08dfa86d70 @BRMatt BRMatt committed Jun 26, 2011
Showing with 2 additions and 2 deletions.
  1. +1 −1 classes/kohana/database.php
  2. +1 −1 guide/database/examples.md
View
2 classes/kohana/database.php
@@ -62,7 +62,7 @@ public static function instance($name = NULL, array $config = NULL)
if ($config === NULL)
{
// Load the configuration for this database
- $config = Kohana::config('database')->$name;
+ $config = Kohana::$config->load('database')->$name;
}
if ( ! isset($config['type']))
View
2 guide/database/examples.md
@@ -28,7 +28,7 @@ In this example, we loop through an array of whitelisted input fields and for ea
$count = $pagination_query->select('COUNT("*") AS mycount')->execute()->get('mycount');
//pass the total item count to Pagination
- $config = Kohana::config('pagination');
+ $config = Kohana::$config->load('pagination');
$pagination = Pagination::factory(array(
'total_items' => $count,
'current_page' => array('source' => 'route', 'key' => 'page'),

0 comments on commit f7ce165

Please sign in to comment.
Something went wrong with that request. Please try again.