From be7bca2303cc9900f2c1a746a10a785d9d95783c Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 28 Jan 2010 16:50:28 -0500 Subject: [PATCH] Revert "move RW setup above user get in index.php so remember_me works" This reverts commit fa7895333724e314e2b32cb89f19a41069c554be. --- index.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/index.php b/index.php index 5aa40440aa..5520d690b5 100644 --- a/index.php +++ b/index.php @@ -146,7 +146,7 @@ function formatBacktraceLine($n, $line) return $out; } -function setupRW() +function checkMirror($action_obj, $args) { global $config; @@ -161,10 +161,7 @@ function setupRW() foreach ($alwaysRW as $table) { $config['db']['table_'.$table] = 'rw'; } -} -function checkMirror($action_obj, $args) -{ if (common_config('db', 'mirror') && $action_obj->isReadOnly($args)) { if (is_array(common_config('db', 'mirror'))) { // "load balancing", ha ha @@ -240,13 +237,9 @@ function main() PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError'); - // Make sure RW database is setup - - setupRW(); - // XXX: we need a little more structure in this script - // get and cache current user (may hit RW!) + // get and cache current user $user = common_current_user();