From a082e740034c29f72bffafa5aee1be34f7ffaabf Mon Sep 17 00:00:00 2001 From: Rostislav Wolny Date: Tue, 3 Dec 2019 10:23:45 +0100 Subject: [PATCH] Fix fetching form styles within Populator [MAILPOET-2451] --- lib/Config/Populator.php | 3 ++- lib/Config/PopulatorData/DefaultForm.php | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/Config/Populator.php b/lib/Config/Populator.php index 555af24214..70578899e3 100644 --- a/lib/Config/Populator.php +++ b/lib/Config/Populator.php @@ -13,6 +13,7 @@ use MailPoet\Cron\Workers\SubscriberLinkTokens; use MailPoet\Cron\Workers\UnsubscribeTokens; use MailPoet\Entities\UserFlagEntity; use MailPoet\Features\FeaturesController; +use MailPoet\Form\Util\Styles; use MailPoet\Mailer\MailerLog; use MailPoet\Models\Form; use MailPoet\Models\Newsletter; @@ -354,7 +355,7 @@ class Populator { private function createDefaultForm($default_segment) { if (Form::count() === 0) { - $factory = new DefaultForm(); + $factory = new DefaultForm(new Styles($this->flags_controller)); if (!$default_segment) { $default_segment = Segment::where('type', 'default')->orderByAsc('id')->limit(1)->findOne(); } diff --git a/lib/Config/PopulatorData/DefaultForm.php b/lib/Config/PopulatorData/DefaultForm.php index 07dfa6f288..406a659d32 100644 --- a/lib/Config/PopulatorData/DefaultForm.php +++ b/lib/Config/PopulatorData/DefaultForm.php @@ -8,6 +8,12 @@ use MailPoet\Models\Segment; use MailPoet\WP\Functions as WPFunctions; class DefaultForm { + /** @var Styles */ + private $form_styles; + + function __construct(Styles $form_styles) { + $this->form_styles = $form_styles; + } public function getName() { return WPFunctions::get()->_x('A GDPR friendly form', 'default name of form (GDPR friendly) to capture emails', 'mailpoet'); @@ -68,7 +74,6 @@ class DefaultForm { } public function getStyles() { - return Styles::$default_styles; + return $this->form_styles->getDefaultStyles(); } - }