Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Fix fetching form styles within Populator

Browse Source 
[MAILPOET-2451]
This commit is contained in:
Rostislav Wolny
2019-12-03 10:23:45 +01:00
committed by Jack Kitterhing
parent fa4ecaa445
commit a082e74003
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Config/Populator.php
View File

@ -13,6 +13,7 @@ use MailPoet\Cron\Workers\SubscriberLinkTokens;
use MailPoet\Cron\Workers\UnsubscribeTokens; use MailPoet\Cron\Workers\UnsubscribeTokens;
use MailPoet\Entities\UserFlagEntity; use MailPoet\Entities\UserFlagEntity;
use MailPoet\Features\FeaturesController; use MailPoet\Features\FeaturesController;
use MailPoet\Form\Util\Styles;
use MailPoet\Mailer\MailerLog; use MailPoet\Mailer\MailerLog;
use MailPoet\Models\Form; use MailPoet\Models\Form;
use MailPoet\Models\Newsletter; use MailPoet\Models\Newsletter;
@ -354,7 +355,7 @@ class Populator {
private function createDefaultForm($default_segment) { private function createDefaultForm($default_segment) {
if (Form::count() === 0) { if (Form::count() === 0) {
$factory = new DefaultForm(); $factory = new DefaultForm(new Styles($this->flags_controller));
if (!$default_segment) { if (!$default_segment) {
$default_segment = Segment::where('type', 'default')->orderByAsc('id')->limit(1)->findOne(); $default_segment = Segment::where('type', 'default')->orderByAsc('id')->limit(1)->findOne();
} }

9
lib/Config/PopulatorData/DefaultForm.php
View File

@ -8,6 +8,12 @@ use MailPoet\Models\Segment;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
class DefaultForm { class DefaultForm {
/** @var Styles */
private $form_styles;
function __construct(Styles $form_styles) {
$this->form_styles = $form_styles;
}
public function getName() { public function getName() {
return WPFunctions::get()->_x('A GDPR friendly form', 'default name of form (GDPR friendly) to capture emails', 'mailpoet'); 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() { public function getStyles() {
return Styles::$default_styles; return $this->form_styles->getDefaultStyles();
} }
} }