diff options
author | Federico Marani <federico.marani@ymail.com> | 2009-03-16 22:43:51 +0000 |
---|---|---|
committer | Federico Marani <federico.marani@ymail.com> | 2009-03-16 22:43:51 +0000 |
commit | 420c3613049bec1360cdeb1f50283b239adf23d3 (patch) | |
tree | 0ab458b3c45c883232b3ed31addbc2aba1288f6a /index.php | |
parent | bab3e1b8586f42bc1f0a5f96b6990d67c6b74446 (diff) | |
parent | b3a0eea3b66e95becb6c4595ed71c7fe71ed6437 (diff) |
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
Diffstat (limited to 'index.php')
-rw-r--r-- | index.php | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -63,7 +63,7 @@ function handleError($error) function main() { - global $user, $action; + global $user, $action, $config; if (!_have_config()) { $msg = sprintf(_("No configuration file found. Try running ". @@ -131,11 +131,11 @@ function main() if (common_config('db', 'mirror') && $action_obj->isReadOnly()) { if (is_array(common_config('db', 'mirror'))) { // "load balancing", ha ha - $k = array_rand($config['db']['mirror']); - - $mirror = $config['db']['mirror'][$k]; + $arr = common_config('db', 'mirror'); + $k = array_rand($arr); + $mirror = $arr[$k]; } else { - $mirror = $config['db']['mirror']; + $mirror = common_config('db', 'mirror'); } $config['db']['database'] = $mirror; } |