From 2f836e2a59e4bfec0f7c0f3bc1f7c1c7006c793f Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Mon, 28 Dec 2015 00:09:06 +0100 Subject: [PATCH] GNU social config paths, removed StatusNet/Laconica --- lib/gnusocial.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/gnusocial.php b/lib/gnusocial.php index 08ca6f37c4..ed87782c47 100644 --- a/lib/gnusocial.php +++ b/lib/gnusocial.php @@ -383,15 +383,11 @@ class GNUsocial 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/laconica/'.$_server.'.php'); + $config_files = array('/etc/gnusocial/config.php', + '/etc/gnusocial/config.d/'.$_server.'.php'); if (strlen($_path) > 0) { - $config_files[] = '/etc/statusnet/'.$_server.'_'.$_path.'.php'; - $config_files[] = '/etc/laconica/'.$_server.'_'.$_path.'.php'; + $config_files[] = '/etc/gnusocial/config.d/'.$_server.'_'.$_path.'.php'; } $config_files[] = INSTALLDIR.'/config.php'; -- 2.39.5