From: Mikael Nordfeldth Date: Fri, 9 May 2014 08:31:55 +0000 (+0200) Subject: OStatus enabled by default, only disabled for private siteprofile X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c15216f00bfde401f6c717842ee3e41b49fddc72;p=quix0rs-gnu-social.git OStatus enabled by default, only disabled for private siteprofile --- diff --git a/lib/default.php b/lib/default.php index e04f10b080..6898c55883 100644 --- a/lib/default.php +++ b/lib/default.php @@ -305,10 +305,12 @@ $default = 'Oembed' => array(), 'OpenID' => array(), 'OpportunisticQM' => array(), + 'OStatus' => array(), 'Poll' => array(), 'QnA' => array(), 'SearchSub' => array(), 'TagSub' => array(), + 'WebFinger' => array(), ), 'locale_path' => false, // Set to a path to use *instead of* each plugin's own locale subdirectories 'server' => null, diff --git a/lib/siteprofile.php b/lib/siteprofile.php index d3ab4c9705..d2a4a00204 100644 --- a/lib/siteprofile.php +++ b/lib/siteprofile.php @@ -110,11 +110,8 @@ class PublicSite extends SiteProfileSettings 'plugins' => array( 'core' => self::corePlugins(), 'default' => array_merge(self::defaultPlugins(), array( - 'Directory' => array(), 'ExtendedProfile' => array(), - 'OStatus' => array(), 'RegisterThrottle' => array(), - 'WebFinger' => array(), )) ), 'discovery' => array('cors' => true) // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.) @@ -147,11 +144,12 @@ class PrivateSite extends SiteProfileSettings 'plugins' => array( 'core' => self::corePlugins(), 'default' => array_merge(self::defaultPlugins(), array( - 'Directory' => array(), 'ExtendedProfile' => array(), 'EmailRegistration' => array(), 'MobileProfile' => array(), - )) + )), + 'disable-OStatus' => 1, + 'disable-WebFinger' => 1, ), 'profile' => array('delete' => 'true'), 'license' => array('type' => 'private'), @@ -199,9 +197,6 @@ class CommunitySite extends SiteProfileSettings 'plugins' => array( 'core' => self::corePlugins(), 'default' => array_merge(self::defaultPlugins(), array( - 'Directory' => array(), - 'OStatus' => array(), - 'WebFinger' => array(), )) ), 'discovery' => array('cors' => true) // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.) @@ -235,11 +230,10 @@ class SingleuserSite extends SiteProfileSettings 'core' => self::corePlugins(), 'default' => array_merge(self::defaultPlugins(), array( 'MobileProfile' => array(), - 'OStatus' => array(), 'TwitterBridge' => array(), 'FacebookBridge' => array(), - 'WebFinger' => array(), - )) + )), + 'disable-Directory' => 1, ), 'discovery' => array('cors' => true) // Allow Cross-Origin Resource Sharing for service discovery (host-meta, XRD, etc.) );