diff options
| author | Friendika <info@friendika.com> | 2011-06-16 15:27:12 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-06-16 15:27:12 -0700 |
| commit | b61a7158da4c8a0b41651a082f0ce2f9ad431f14 (patch) | |
| tree | 04257f59cd49725522aee9e210ab740970ab48f4 /index.php | |
| parent | c92e6ed929ddb12a3020eecf419a30b680fe4240 (diff) | |
| parent | a652cd5095fcff6ed9c72063ab19107e970e2b8d (diff) | |
| download | volse-hubzilla-b61a7158da4c8a0b41651a082f0ce2f9ad431f14.tar.gz volse-hubzilla-b61a7158da4c8a0b41651a082f0ce2f9ad431f14.tar.bz2 volse-hubzilla-b61a7158da4c8a0b41651a082f0ce2f9ad431f14.zip | |
Merge pull request #116 from fabrixxm/admin
Admin pages
Diffstat (limited to 'index.php')
| -rw-r--r-- | index.php | 15 |
1 files changed, 14 insertions, 1 deletions
@@ -29,7 +29,6 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false @include(".htconfig.php"); - $lang = get_language(); load_translation_table($lang); @@ -46,6 +45,20 @@ $db = new dba($db_host, $db_user, $db_pass, $db_data, $install); /** + * 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']; + } +} +unset($r); + + +/** * * Important stuff we always need to do. * Initialise authentication and date and time. |