revup

[friendica.git] / index.php

diff --git a/index.php b/index.php
index a58e4730fa42fe77744b18c548af26f7b5f141a3..3e72baddc5a9d7ec278d9aa9b410da6e4e161564 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,7 +1,5 @@
 <?php
 
-error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
 /**
  *
  * Friendika
@@ -50,15 +48,8 @@ if(! $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);
+       load_config('config');
+       load_config('system');
 
        require_once("session.php");
        load_hooks();