Core plugin list would not merge into $config

diff --git a/lib/siteprofile.php b/lib/siteprofile.php
index 420b4f3e93f890cb8ff0847eb34ee7e3c62e4c27..ff7f6f61e9edcc55562f3d440c7b1ffe6eb7b0f9 100644 (file)
--- a/lib/siteprofile.php
+++ b/lib/siteprofile.php
@@ -78,9 +78,11 @@ abstract class SiteProfileSettings
         throw new MethodNotImplementedException(__METHOD__);
     }
 
+    static function corePlugins() {
+        return common_config('plugins', 'core');
+    }
     static function defaultPlugins() {
-        return array_merge(common_config('plugins', 'core'),
-                           common_config('plugins', 'default'));
+        return common_config('plugins', 'default');
     }
 }
 
@@ -106,6 +108,7 @@ class PublicSite extends SiteProfileSettings
                 )
             ),
             'plugins' => array(
+                'core'    => self::corePlugins(),
                 'default' => array_merge(self::defaultPlugins(), array(
                     'Directory'               => null,
                     'ExtendedProfile'         => null,
@@ -142,6 +145,7 @@ class PrivateSite extends SiteProfileSettings
                 )
             ),
             'plugins' => array(
+                'core'    => self::corePlugins(),
                 'default' => array_merge(self::defaultPlugins(), array(
                     'Directory'               => null,
                     'ExtendedProfile'         => null,
@@ -194,6 +198,7 @@ class CommunitySite extends SiteProfileSettings
                 )
             ),
             'plugins' => array(
+                'core'    => self::corePlugins(),
                 'default' => array_merge(self::defaultPlugins(), array(
                     'Directory'               => null,
                     'Geonames'                => null,
@@ -229,6 +234,7 @@ class SingleuserSite extends SiteProfileSettings
                 )
             ),
             'plugins' => array(
+                'core'    => self::corePlugins(),
                 'default' => array_merge(self::defaultPlugins(), array(
                     'Geonames'                => null,
                     'NewMenu'                 => null,

diff --git a/lib/statusnet.php b/lib/statusnet.php
index 0a15d3b5251099b927b970743764908c44ea0cfa..56ac0cb1d31c7c223678e88da9bb0b5eab969441 100644 (file)
--- 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();