Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / lib / gnusocial.php

diff --git a/lib/gnusocial.php b/lib/gnusocial.php
index 08ca6f37c4be3b869f72629d03787b06b0c33753..ed87782c472e1f3a8dde0b6f5592dda487904fe7 100644 (file)
--- 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';