Move cfg/defines.php to inc/, to avoid confusing with user-configurable

things, which it is not, or at least not in that file.

diff --git a/api/timeout.php b/api/timeout.php
index fc589d3620ebce5cf20d76f736ad5ac62a8bf959..5267f2300c75e0d4270d614fd74c082e1e71de04 100644 (file)
--- a/api/timeout.php
+++ b/api/timeout.php
@@ -1,6 +1,6 @@
 <?php
 
-include "../cfg/defines.php";
+include "../inc/defines.php";
 session_start();
 //timeout after 10 mins of inactivity
 if (isset($_SESSION["id"]) && isset($_SESSION["last-activity"]) && time() - $_SESSION["last-activity"] < $_SESSION['session_timeout'])

diff --git a/inc/common.php b/inc/common.php
index fa3f7c7da5720657a52129dbb69fb67c7ec7afca..213c14255e359fde1d7002cee1aa369b52497c28 100644 (file)
--- a/inc/common.php
+++ b/inc/common.php
@@ -310,7 +310,7 @@ if (!is_dir(UPATH . "/vendor"))
        die("The vendor/ directory is missing. Most likely the admin forgot to run 'composer install'\n");
 require_once UPATH . '/vendor/autoload.php';
 require_once UPATH . "/Classes/class-cmodes.php";
-require_once UPATH . "/cfg/defines.php";
+require_once UPATH . "/inc/defines.php";
 require_once UPATH . "/misc/strings.php";
 require_once UPATH . "/misc/channel-lookup-misc.php";
 require_once UPATH . "/misc/user-lookup-misc.php";

diff --git a/cfg/defines.php b/inc/defines.php
similarity index 100%
rename from cfg/defines.php
rename to inc/defines.php