summaryrefslogtreecommitdiff
path: root/lib/common.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-08-26 10:34:50 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-08-26 10:34:50 -0400
commit434abed511faa045c506c75443895b7e4ce7ff3f (patch)
treec20040615da71931ad44569ffad106e4f658c1e4 /lib/common.php
parent379c80e26e2de30841f7fb49e7e967e675a4951f (diff)
add back in /etc/laconica/* for compatibility
Diffstat (limited to 'lib/common.php')
-rw-r--r--lib/common.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/common.php b/lib/common.php
index 9a5d33e65..e658eaeb2 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -342,11 +342,14 @@ if (isset($conffile)) {
$_config_files = array($conffile);
} else {
$_config_files = array('/etc/statusnet/statusnet.php',
+ '/etc/statusnet/laconica.php',
'/etc/laconica/laconica.php',
- '/etc/statusnet/'.$_server.'.php');
+ '/etc/statusnet/'.$_server.'.php',
+ '/etc/laconica/'.$_server.'.php');
if (strlen($_path) > 0) {
$_config_files[] = '/etc/statusnet/'.$_server.'_'.$_path.'.php';
+ $_config_files[] = '/etc/laconica/'.$_server.'_'.$_path.'.php';
}
$_config_files[] = INSTALLDIR.'/config.php';