aboutsummaryrefslogtreecommitdiffstats
path: root/index.php
diff options
context:
space:
mode:
Diffstat (limited to 'index.php')
-rwxr-xr-xindex.php15
1 files changed, 2 insertions, 13 deletions
diff --git a/index.php b/index.php
index ae8a2e17d..a13d22d8c 100755
--- a/index.php
+++ b/index.php
@@ -40,8 +40,8 @@ date_default_timezone_set($a->timezone);
require_once("include/dba/dba_driver.php");
if(! $a->install) {
- $db = dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $a->install);
- unset($db_host, $db_port, $db_user, $db_pass, $db_data);
+ $db = dba_factory($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type, $a->install);
+ unset($db_host, $db_port, $db_user, $db_pass, $db_data, $db_type);
/**
* Load configs from db. Overwrite configs from .htconfig.php
@@ -198,21 +198,10 @@ if(strlen($a->module)) {
if(! $a->module_loaded) {
- /*
- * Traditionally we looked in custom first, but we're leaning toward a convention where site
- * specific things are all in directories called 'site'. So custom will be going away.
- * There are a very small number of folks affected. You know who you are. Once you've got things sorted,
- * please remove the lines for "custom/" and push to the project repository.
- */
-
if(file_exists("mod/site/{$a->module}.php")) {
include_once("mod/site/{$a->module}.php");
$a->module_loaded = true;
}
- elseif(file_exists("custom/{$a->module}.php")) {
- include_once("custom/{$a->module}.php");
- $a->module_loaded = true;
- }
elseif(file_exists("mod/{$a->module}.php")) {
include_once("mod/{$a->module}.php");
$a->module_loaded = true;