move db-prefs to OO

[tt-rss.git] / public.php

diff --git a/public.php b/public.php
index dccd77f43b3353c9243d706e375a6ab5d96e8c15..2f5081957a1abd75a219d090537231ad9cf953a6 100644 (file)
--- a/public.php
+++ b/public.php
@@ -17,6 +17,7 @@
                $_REQUEST = array_map('stripslashes_deep', $_REQUEST);
        }
 
+       require_once "autoload.php";
        require_once "sessions.php";
        require_once "functions.php";
        require_once "sanity_check.php";
@@ -24,15 +25,11 @@
        require_once "db.php";
        require_once "db-prefs.php";
 
-       no_cache_incantation();
-
        startup_gettext();
 
        $script_started = microtime(true);
 
-       $link = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
-       if (!init_connection($link)) return;
+       if (!init_plugins()) return;
 
        if (ENABLE_GZIP_OUTPUT && function_exists("ob_gzhandler")) {
                ob_start("ob_gzhandler");
@@ -46,7 +43,7 @@
        if ($override) {
                $handler = $override;
        } else {
-               $handler = new Handler_Public($link, $_REQUEST);
+               $handler = new Handler_Public(Db::get(), $_REQUEST);
        }
 
        if (implements_interface($handler, "IHandler") && $handler->before($method)) {
@@ -62,6 +59,4 @@
        header("Content-Type: text/plain");
        print json_encode(array("error" => array("code" => 7)));
 
-       // We close the connection to database.
-       db_close($link);
 ?>