From 51877fe1eb37f810c48f9ce52d38b60a3457a047 Mon Sep 17 00:00:00 2001 From: Rostislav Wolny Date: Tue, 29 Dec 2020 18:01:27 +0100 Subject: [PATCH] Reactor loading of wp-admin/includes/plugin.php Requiring WordPress PHP file within Initializer was causing errors in static analysis that runs without WordPress source. [MAILPOET-2837] --- lib/Config/Initializer.php | 2 -- mailpoet_initializer.php | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/Config/Initializer.php b/lib/Config/Initializer.php index 366afbf6e8..5ab6db6549 100644 --- a/lib/Config/Initializer.php +++ b/lib/Config/Initializer.php @@ -16,8 +16,6 @@ use MailPoet\WooCommerce\TransactionalEmailHooks as WCTransactionalEmails; use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Notice as WPNotice; -require_once(ABSPATH . 'wp-admin/includes/plugin.php'); - class Initializer { public $automaticEmails; diff --git a/mailpoet_initializer.php b/mailpoet_initializer.php index 69f42c9d83..057c73697f 100644 --- a/mailpoet_initializer.php +++ b/mailpoet_initializer.php @@ -71,5 +71,8 @@ if (!$requirementsCheckResults[RequirementsChecker::TEST_PDO_EXTENSION] || return; } +// Ensure functions like get_plugins, etc. +require_once(ABSPATH . 'wp-admin/includes/plugin.php'); + $initializer = MailPoet\DI\ContainerWrapper::getInstance()->get(MailPoet\Config\Initializer::class); $initializer->init();