Skip to content

Commit

Permalink
Follow up to da2b5f9, changed Database::$name to Database::$default f…
Browse files Browse the repository at this point in the history
…or consistency
  • Loading branch information
Woody Gilk committed May 23, 2010
1 parent c178be1 commit 321c676
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions classes/kohana/database.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ abstract class Kohana_Database {
const DELETE = 4;

/**
* @var string default database instance name
* @var string default instance name
*/
public static $name = 'default';
public static $default = 'default';

/**
* @var array Database instances
Expand All @@ -47,8 +47,8 @@ public static function instance($name = NULL, array $config = NULL)
{
if ($name === NULL)
{
// Use the default database instance name
$name = Database::$name;
// Use the default instance name
$name = Database::$default;
}

if ( ! isset(Database::$instances[$name]))
Expand Down

0 comments on commit 321c676

Please sign in to comment.