Merge branch '0.7.x' into 0.8.x

1 files changed, 13 insertions, 0 deletions

diff --git a/lib/common.php b/lib/common.php
index 4fc749ca0..0fff3af2e 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -178,12 +178,25 @@ if (strlen($_path) > 0) {
 
 $_config_files[] = INSTALLDIR.'/config.php';
 
+$_have_a_config = false;
+
 foreach ($_config_files as $_config_file) {
     if (file_exists($_config_file)) {
         include_once($_config_file);
+        $_have_a_config = true;
     }
 }
 
+// XXX: Throw a conniption if database not installed
+
+// Fixup for laconica.ini
+
+$_db_name = substr($config['db']['database'], strrpos($config['db']['database'], '/') + 1);
+
+if ($_db_name != 'laconica' && !array_key_exists('ini_'.$_db_name, $config['db'])) {
+    $config['db']['ini_'.$_db_name] = INSTALLDIR.'/classes/laconica.ini';
+}
+
 // XXX: how many of these could be auto-loaded on use?
 
 require_once('Validate.php');