GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Revert "Revert "move RW setup above user get in index.php so remember_me works""

Browse Source 
This reverts commit be7bca2303.
This commit is contained in:
Evan Prodromou 2010-01-28 16:52:05 -05:00
parent be7bca2303
commit a33194effb
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
index.php
View File

@ -146,7 +146,7 @@ function formatBacktraceLine($n, $line)
return $out; return $out;
} }
function checkMirror($action_obj, $args) function setupRW()
{ {
global $config; global $config;
@ -161,7 +161,10 @@ function checkMirror($action_obj, $args)
foreach ($alwaysRW as $table) { foreach ($alwaysRW as $table) {
$config['db']['table_'.$table] = 'rw'; $config['db']['table_'.$table] = 'rw';
} }
}
function checkMirror($action_obj, $args)
{
if (common_config('db', 'mirror') && $action_obj->isReadOnly($args)) { if (common_config('db', 'mirror') && $action_obj->isReadOnly($args)) {
if (is_array(common_config('db', 'mirror'))) { if (is_array(common_config('db', 'mirror'))) {
// "load balancing", ha ha // "load balancing", ha ha
@ -237,9 +240,13 @@ function main()
PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError'); PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError');
// Make sure RW database is setup
setupRW();
// XXX: we need a little more structure in this script // XXX: we need a little more structure in this script
// get and cache current user // get and cache current user (may hit RW!)
$user = common_current_user(); $user = common_current_user();