Core plugin list would not merge into $config

2013-10-19 15:25:59 +02:00
parent 565e32aca3
commit 0398741956
2 changed files with 11 additions and 5 deletions
--- a/lib/statusnet.php
+++ b/lib/statusnet.php
@@ -110,12 +110,12 @@ class StatusNet
    {
        Router::clear();

-        StatusNet::initDefaults($server, $path);
-        StatusNet::loadConfigFile($conffile);
+        self::initDefaults($server, $path);
+        self::loadConfigFile($conffile);

        $sprofile = common_config('site', 'profile');
        if (!empty($sprofile)) {
-            StatusNet::loadSiteProfile($sprofile);
+            self::loadSiteProfile($sprofile);
        }
        // Load settings from database; note we need autoload for this
        Config::loadSettings();