keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

don't load configs if no database.

Browse source
This commit is contained in:
Friendika 2011-06-27 17:18:13 -07:00
parent 1947b74e5b
commit 29c57f7ad2
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
index.php
View file

@ -44,18 +44,26 @@ $db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
unset($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data);
/** if(! $install) {
* Load configs from db. Overwrite configs from .htconfig.php
*/ /**
$r = q("SELECT * FROM `config` WHERE `cat` IN ('system', 'config')"); * Load configs from db. Overwrite configs from .htconfig.php
foreach ($r as $c) { */
if ($c['cat']=='config') {
$a->config[$c['k']] = $c['v']; $r = q("SELECT * FROM `config` WHERE `cat` IN ('system', 'config')");
} else { foreach ($r as $c) {
$a->config[$c['cat']][$c['k']] = $c['v']; if ($c['cat']=='config') {
$a->config[$c['k']] = $c['v'];
} else {
$a->config[$c['cat']][$c['k']] = $c['v'];
}
} }
unset($r);
require_once("session.php");
load_hooks();
call_hooks('init_1');
} }
unset($r);
/** /**
@ -70,14 +78,6 @@ unset($r);
* *
*/ */
if(! $install) {
require_once("session.php");
load_hooks();
call_hooks('init_1');
}
require_once("datetime.php"); require_once("datetime.php");
$a->timezone = (($default_timezone) ? $default_timezone : 'UTC'); $a->timezone = (($default_timezone) ? $default_timezone : 'UTC');