- various updates, bugfixes and improvements

1 files changed, 13 insertions, 3 deletions

diff --git a/includes/common.inc b/includes/common.inc
index 392fc474b..f5ebc09d6 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -1,7 +1,17 @@
 <?
 
-$cf = strtr($HTTP_HOST ."". substr($REQUEST_URI, 0, strrpos($REQUEST_URI, "/")), "/:", "..");
-include_once "includes/$cf.conf";
+function conf_load() {
+  global $HTTP_HOST, $REQUEST_URI;
+  $file = strtr($HTTP_HOST ."". substr($REQUEST_URI, 0, strrpos($REQUEST_URI, "/")), "/:", "..");
+  while ($file && !file_exists("includes/$file.conf")) {
+    $file = substr($file, 0, strrpos($file, "."));
+  }
+  return $file;
+}
+
+$conf = conf_load();
+
+include_once "includes/$conf.conf";
 include_once "includes/database.inc";
 include_once "includes/watchdog.inc";
 include_once "includes/function.inc";
@@ -10,7 +20,7 @@ include_once "includes/locale.inc";
 include_once "includes/theme.inc";
 include_once "includes/user.inc";
 
-session_start();
+user_load();
 
 $theme = theme_load();