diff options
author | fabrixxm <fabrix.xm@gmail.com> | 2011-07-05 07:11:57 +0200 |
---|---|---|
committer | fabrixxm <fabrix.xm@gmail.com> | 2011-07-05 07:11:57 +0200 |
commit | 4e7a5dc56ebb8d99ed06b0b303c4ee24460ae6a8 (patch) | |
tree | 84184bd3aa80c896b8dceaf5a017297c7267f2cb /index.php | |
parent | cfd59f6ac8848c19a0c451c378d2b770cafcbef0 (diff) | |
parent | 2359783b9f6c0ec754c641453026712cf22e7cb6 (diff) | |
download | volse-hubzilla-4e7a5dc56ebb8d99ed06b0b303c4ee24460ae6a8.tar.gz volse-hubzilla-4e7a5dc56ebb8d99ed06b0b303c4ee24460ae6a8.tar.bz2 volse-hubzilla-4e7a5dc56ebb8d99ed06b0b303c4ee24460ae6a8.zip |
Merge branch 'dispy' of github.com:fabrixxm/friendika into dispy
Diffstat (limited to 'index.php')
-rw-r--r-- | index.php | 31 |
1 files changed, 12 insertions, 19 deletions
@@ -44,18 +44,19 @@ $db = new dba($db_host, $db_user, $db_pass, $db_data, $install); unset($db_host, $db_user, $db_pass, $db_data); -/** - * Load configs from db. Overwrite configs from .htconfig.php - */ -$r = q("SELECT * FROM `config` WHERE `cat` IN ('system', 'config')"); -foreach ($r as $c) { - if ($c['cat']=='config') { - $a->config[$c['k']] = $c['v']; - } else { - $a->config[$c['cat']][$c['k']] = $c['v']; - } +if(! $install) { + + /** + * Load configs from db. Overwrite configs from .htconfig.php + */ + + load_config('config'); + load_config('system'); + + require_once("session.php"); + load_hooks(); + call_hooks('init_1'); } -unset($r); /** @@ -70,14 +71,6 @@ unset($r); * */ -if(! $install) { - require_once("session.php"); - load_hooks(); - call_hooks('init_1'); -} - - - require_once("datetime.php"); $a->timezone = (($default_timezone) ? $default_timezone : 'UTC'); |