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

Remove extra sending method check for new users.

Browse Source 
mta.method is probably not set yet.

MAILPOET-4929
This commit is contained in:
Oluwaseun Olorunsola
2023-01-24 16:57:18 +01:00
committed by Aschepikov
parent 805804f3d3
commit 10ea5ec55b
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mailpoet/lib/Config/Activator.php
View File

@@ -136,13 +136,9 @@ class Activator {
if (!is_null($version)) return; // not a new user
$sendingMethodSet = $this->settings->get('mta.method', false);
if ($sendingMethodSet === 'PHPMail') {
// check for valid mail function
// check for valid mail function on new installs
$this->settings->set(DisabledMailFunctionNotice::QUEUE_DISABLED_MAIL_FUNCTION_CHECK, true);
}
}
private function deleteAllMailPoetTablesAndData(): void {
$prefix = Env::$dbPrefix;

2
mailpoet/lib/Util/Notices/DisabledMailFunctionNotice.php
View File

@@ -57,7 +57,7 @@ class DisabledMailFunctionNotice {
$this->settings->set(self::QUEUE_DISABLED_MAIL_FUNCTION_CHECK, false);
}
$sendingMethod = $this->settings->get('mta.method', false);
$sendingMethod = $this->settings->get('mta.method', SettingsController::DEFAULT_SENDING_METHOD);
$isPhpMailSendingMethod = $sendingMethod === Mailer::METHOD_PHPMAIL;
if (!$isPhpMailSendingMethod) {