Merge branch '0.7.x' into 0.8.x

Conflicts:

	classes/Notice.php
	lib/action.php
	lib/router.php
	lib/twitter.php

1 files changed, 5 insertions, 5 deletions

diff --git a/index.php b/index.php
index dae1ae751..e83d08c13 100644
--- a/index.php
+++ b/index.php
@@ -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;
         }