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

Remove feature flag for transactional emails

Browse Source 
[MAILPOET-2536]
This commit is contained in:
Ján Mikláš
2019-12-04 15:38:52 +01:00
committed by Jack Kitterhing
parent 462c82f1b0
commit 90e49e9399
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Features/FeaturesController.php
View File

@ -9,7 +9,6 @@ class FeaturesController {
// Define features below in the following form: // Define features below in the following form:
// const FEATURE_NAME_OF_FEATURE = 'name-of-feature'; // const FEATURE_NAME_OF_FEATURE = 'name-of-feature';
const NEW_DEFAULT_LIST_NAME = 'new-default-list-name'; const NEW_DEFAULT_LIST_NAME = 'new-default-list-name';
const SEND_WORDPRESS_MAILS_WITH_MP3 = 'send-wordpress-mails-with-mp3';
const WC_TRANSACTIONAL_EMAILS_CUSTOMIZER = 'wc-transactional-emails-customizer'; const WC_TRANSACTIONAL_EMAILS_CUSTOMIZER = 'wc-transactional-emails-customizer';
const DISPLAY_MSS_PITCH = 'display-mss-pitch'; const DISPLAY_MSS_PITCH = 'display-mss-pitch';
const NEW_FORM_EDITOR = 'new-form-editor'; const NEW_FORM_EDITOR = 'new-form-editor';
@ -18,7 +17,6 @@ class FeaturesController {
// self::FEATURE_NAME_OF_FEATURE => true, // self::FEATURE_NAME_OF_FEATURE => true,
private $defaults = [ private $defaults = [
self::NEW_DEFAULT_LIST_NAME => false, self::NEW_DEFAULT_LIST_NAME => false,
self::SEND_WORDPRESS_MAILS_WITH_MP3 => false,
self::WC_TRANSACTIONAL_EMAILS_CUSTOMIZER => false, self::WC_TRANSACTIONAL_EMAILS_CUSTOMIZER => false,
self::DISPLAY_MSS_PITCH => false, self::DISPLAY_MSS_PITCH => false,
self::NEW_FORM_EDITOR => false, self::NEW_FORM_EDITOR => false,

12
lib/Mailer/WordPress/WordpressMailerReplacer.php
View File

@ -2,16 +2,12 @@
namespace MailPoet\Mailer\WordPress; namespace MailPoet\Mailer\WordPress;
use MailPoet\Features\FeaturesController;
use MailPoet\Mailer\Mailer; use MailPoet\Mailer\Mailer;
use MailPoet\Mailer\MetaInfo; use MailPoet\Mailer\MetaInfo;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
class WordpressMailerReplacer { class WordpressMailerReplacer {
/** @var FeaturesController */
private $features_controller;
/** @var Mailer */ /** @var Mailer */
private $mailer; private $mailer;
@ -21,8 +17,7 @@ class WordpressMailerReplacer {
/** @var SettingsController */ /** @var SettingsController */
private $settings; private $settings;
function __construct(FeaturesController $features_controller, Mailer $mailer, MetaInfo $mailerMetaInfo, SettingsController $settings) { function __construct(Mailer $mailer, MetaInfo $mailerMetaInfo, SettingsController $settings) {
$this->features_controller = $features_controller;
$this->mailer = $mailer; $this->mailer = $mailer;
$this->mailerMetaInfo = $mailerMetaInfo; $this->mailerMetaInfo = $mailerMetaInfo;
$this->settings = $settings; $this->settings = $settings;
@ -30,10 +25,7 @@ class WordpressMailerReplacer {
public function replaceWordPressMailer() { public function replaceWordPressMailer() {
global $phpmailer; global $phpmailer;
$phpmailer = new WordPressMailer($this->mailer, $this->createFallbackMailer(), $this->mailerMetaInfo);
if ($this->features_controller->isSupported(FeaturesController::SEND_WORDPRESS_MAILS_WITH_MP3)) {
$phpmailer = new WordPressMailer($this->mailer, $this->createFallbackMailer(), $this->mailerMetaInfo);
}
return $phpmailer; return $phpmailer;
} }