wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GNU social config paths, removed StatusNet/Laconica

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-12-28 00:09:06 +01:00
parent 17a65ff873
commit 2f836e2a59
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/gnusocial.php
View File

@ -383,15 +383,11 @@ class GNUsocial
if (isset($conffile)) { if (isset($conffile)) {
$config_files = array($conffile); $config_files = array($conffile);
} else { } else {
$config_files = array('/etc/statusnet/statusnet.php', $config_files = array('/etc/gnusocial/config.php',
'/etc/statusnet/laconica.php', '/etc/gnusocial/config.d/'.$_server.'.php');
'/etc/laconica/laconica.php',
'/etc/statusnet/'.$_server.'.php',
'/etc/laconica/'.$_server.'.php');
if (strlen($_path) > 0) { if (strlen($_path) > 0) {
$config_files[] = '/etc/statusnet/'.$_server.'_'.$_path.'.php'; $config_files[] = '/etc/gnusocial/config.d/'.$_server.'_'.$_path.'.php';
$config_files[] = '/etc/laconica/'.$_server.'_'.$_path.'.php';
} }
$config_files[] = INSTALLDIR.'/config.php'; $config_files[] = INSTALLDIR.'/config.php';