Get rid of db.php and include config directly in entry points

3 files changed, 1 insertions, 16 deletions

diff --git a/ratatoeskr/sys/db.php b/ratatoeskr/sys/db.php
deleted file mode 100644
index 4d1f493..0000000
--- a/ratatoeskr/sys/db.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/*
- * File: ratatoeskr/sys/db.php
- *
- * Helper functions for dealing with MySQL.
- *
- * License:
- * This file is part of Ratatöskr.
- * Ratatöskr is licensed unter the MIT / X11 License.
- * See "ratatoeskr/licenses/ratatoeskr" for more information.
- */
-
-if (!defined("SETUP")) {
-    require_once(dirname(__FILE__) . "/../config.php");
-}
diff --git a/ratatoeskr/sys/models.php b/ratatoeskr/sys/models.php
index 3edb1d6..0716690 100644
--- a/ratatoeskr/sys/models.php
+++ b/ratatoeskr/sys/models.php
@@ -15,7 +15,6 @@ use r7r\cms\sys\models\KVStorage;
 use r7r\cms\sys\Database;
 use r7r\cms\sys\DbTransaction;
 
-require_once(dirname(__FILE__) . "/db.php");
 require_once(dirname(__FILE__) . "/textprocessors.php");
 require_once(dirname(__FILE__) . "/pluginpackage.php");
 
diff --git a/ratatoeskr/sys/plugin_api.php b/ratatoeskr/sys/plugin_api.php
index 082b605..1920032 100644
--- a/ratatoeskr/sys/plugin_api.php
+++ b/ratatoeskr/sys/plugin_api.php
@@ -13,6 +13,7 @@ use r7r\ste\STECore;
 use r7r\cms\sys\Env;
 use r7r\cms\sys\textprocessors\LegacyTextprocessor;
 
+require_once(dirname(__FILE__) . "/../config.php");
 require_once(dirname(__FILE__) . "/models.php");
 require_once(dirname(__FILE__) . "/textprocessors.php");
 require_once(dirname(__FILE__) . "/../frontend.php");