Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/lib/siteprofile.php b/lib/siteprofile.php
index 569a4bbaf8d56f9eb987821784352822e137c8f2..a2c09efb2f6be08f5dc0919573ff1a0b601d5d71 100644 (file)
--- a/lib/siteprofile.php
+++ b/lib/siteprofile.php
@@ -110,7 +110,6 @@ class PublicSite extends SiteProfileSettings
             'plugins' => array(
                 'core'    => self::corePlugins(),
                 'default' => array_merge(self::defaultPlugins(), array(
-                    'ExtendedProfile'         => array(),
                     'RegisterThrottle'        => array(),
                 ))
             ),
@@ -151,6 +150,7 @@ class PrivateSite extends SiteProfileSettings
                 'disable-OStatus' => 1,
                 'disable-WebFinger' => 1,
              ),
+            'public'        => array('localonly' => true),
             'profile'       => array('delete' => 'true'),
             'license'       => array('type'   => 'private'),
             'attachments'   => array(
@@ -199,6 +199,7 @@ class CommunitySite extends SiteProfileSettings
                 'default' => array_merge(self::defaultPlugins(), array(
                 ))
             ),
+            'public'    => array('localonly' => true),
             'discovery' => array('cors' => true) // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
         );
     }
@@ -224,6 +225,7 @@ class SingleuserSite extends SiteProfileSettings
                 $config['site'], array(
                     'private'    => false,
                     'closed'     => true,
+                    'localonly'  => true,
                 )
             ),
             'plugins' => array(
@@ -233,6 +235,7 @@ class SingleuserSite extends SiteProfileSettings
                 )),
                 'disable-Directory' => 1,
             ),
+            'public'    => array('localonly' => true),
             'discovery' => array('cors' => true) // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.)
         );
     }