diff options
author | Evan Prodromou <evan@status.net> | 2009-09-15 17:16:35 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-09-15 17:16:35 -0400 |
commit | 13147143fc830e81b80ae86bf4cc4f745ce04381 (patch) | |
tree | 7197e7c3437e028a1bc2358f38ac3964cf3fe6e9 /classes/Status_network.php | |
parent | e559f82e86c495abdc4cf5fff3d8c6279a808354 (diff) | |
parent | 4081ed79b02fd06f7c347803478e1f835311c2ab (diff) |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'classes/Status_network.php')
-rw-r--r-- | classes/Status_network.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/Status_network.php b/classes/Status_network.php index d526cb4d6..fe4f0b0c5 100644 --- a/classes/Status_network.php +++ b/classes/Status_network.php @@ -54,7 +54,7 @@ class Status_network extends DB_DataObject global $config; $config['db']['database_'.$dbname] = "mysqli://$dbuser:$dbpass@$dbhost/$dbname"; - $config['db']['ini_'.$dbname] = INSTALLDIR.'/classes/statusnet.ini'; + $config['db']['ini_'.$dbname] = INSTALLDIR.'/classes/status_network.ini'; $config['db']['table_status_network'] = $dbname; self::$cache = new Memcache(); |