GNUSOCIAL, not STATUSNET. Too many changes to be backwards compatible

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

diff --git a/lib/siteprofile.php b/lib/siteprofile.php
index 420b4f3e93f890cb8ff0847eb34ee7e3c62e4c27..087dca48587759fef3e68d6e26023131384b7044 100644 (file)
--- a/lib/siteprofile.php
+++ b/lib/siteprofile.php
@@ -28,7 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
+if (!defined('GNUSOCIAL')) {
     exit(1);
 }
 
@@ -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,10 +108,10 @@ class PublicSite extends SiteProfileSettings
                 )
             ),
             'plugins' => array(
+                'core'    => self::corePlugins(),
                 'default' => array_merge(self::defaultPlugins(), array(
                     'Directory'               => null,
                     'ExtendedProfile'         => null,
-                    'Geonames'                => null,
                     'OStatus'                 => null,
                     'WebFinger'               => null,
                 ))
@@ -142,12 +144,11 @@ class PrivateSite extends SiteProfileSettings
                 )
             ),
             'plugins' => array(
+                'core'    => self::corePlugins(),
                 'default' => array_merge(self::defaultPlugins(), array(
                     'Directory'               => null,
                     'ExtendedProfile'         => null,
                     'EmailRegistration'       => null,
-                    'Geonames'                => null,
-                    'NewMenu'                 => null,
                     'MobileProfile'           => null,
                 ))
              ),
@@ -194,9 +195,9 @@ class CommunitySite extends SiteProfileSettings
                 )
             ),
             'plugins' => array(
+                'core'    => self::corePlugins(),
                 'default' => array_merge(self::defaultPlugins(), array(
                     'Directory'               => null,
-                    'Geonames'                => null,
                     'OStatus'                 => null,
                     'WebFinger'               => null,
                 ))
@@ -229,9 +230,8 @@ class SingleuserSite extends SiteProfileSettings
                 )
             ),
             'plugins' => array(
+                'core'    => self::corePlugins(),
                 'default' => array_merge(self::defaultPlugins(), array(
-                    'Geonames'                => null,
-                    'NewMenu'                 => null,
                     'MobileProfile'           => null,
                     'OStatus'                 => null,
                     'TwitterBridge'           => null,