diff options
author | Zach Copley <zach@controlyourself.ca> | 2009-08-29 06:20:50 +0000 |
---|---|---|
committer | Zach Copley <zach@controlyourself.ca> | 2009-08-29 06:20:50 +0000 |
commit | 87ae90c9037a6ff2fed2612a5d5e16707aa05b6e (patch) | |
tree | a2e1b86e1346afc55b33994ccd028616e26be66e /classes/Status_network.php | |
parent | c02e8a46878ba3ba1ea24f746db8ef0039d19612 (diff) | |
parent | a44c064397bc7ec6f4aa5e91d8288cd57f79e34a (diff) |
Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.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(); |