From 2a1cc45124b5882fb9d93e584f93e06a4412775a Mon Sep 17 00:00:00 2001 From: Matthias Pfefferle Date: Sat, 23 May 2020 12:34:42 +0200 Subject: [PATCH] do not load NodeInfo class if blog is private --- activitypub.php | 7 +++++-- includes/rest/class-nodeinfo.php | 8 +++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/activitypub.php b/activitypub.php index fe834cdb..14965772 100644 --- a/activitypub.php +++ b/activitypub.php @@ -52,8 +52,11 @@ function init() { require_once \dirname( __FILE__ ) . '/includes/rest/class-webfinger.php'; \Activitypub\Rest\Webfinger::init(); - require_once \dirname( __FILE__ ) . '/includes/rest/class-nodeinfo.php'; - \Activitypub\Rest\NodeInfo::init(); + // load NodeInfo endpoints only if blog is public + if ( 1 === get_option( 'blog_public', 1 ) ) { + require_once \dirname( __FILE__ ) . '/includes/rest/class-nodeinfo.php'; + \Activitypub\Rest\NodeInfo::init(); + } require_once \dirname( __FILE__ ) . '/includes/class-admin.php'; \Activitypub\Admin::init(); diff --git a/includes/rest/class-nodeinfo.php b/includes/rest/class-nodeinfo.php index 9ddd6e34..5464e082 100644 --- a/includes/rest/class-nodeinfo.php +++ b/includes/rest/class-nodeinfo.php @@ -13,11 +13,9 @@ class Nodeinfo { * Initialize the class, registering WordPress hooks */ public static function init() { - if ( 1 === get_option( 'blog_public', 1 ) ) { - \add_action( 'rest_api_init', array( '\Activitypub\Rest\Nodeinfo', 'register_routes' ) ); - \add_filter( 'nodeinfo_data', array( '\Activitypub\Rest\Nodeinfo', 'add_nodeinfo_discovery' ), 10, 2 ); - \add_filter( 'nodeinfo2_data', array( '\Activitypub\Rest\Nodeinfo', 'add_nodeinfo2_discovery' ), 10 ); - } + \add_action( 'rest_api_init', array( '\Activitypub\Rest\Nodeinfo', 'register_routes' ) ); + \add_filter( 'nodeinfo_data', array( '\Activitypub\Rest\Nodeinfo', 'add_nodeinfo_discovery' ), 10, 2 ); + \add_filter( 'nodeinfo2_data', array( '\Activitypub\Rest\Nodeinfo', 'add_nodeinfo2_discovery' ), 10 ); } /**