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

Replace "new SettingsController()" with fetch from DI container

Browse Source 
[MAILPOET-2436]
This commit is contained in:
Jan Jakeš
2019-10-24 10:48:58 +02:00
committed by Jack Kitterhing
parent c91cd1255a
commit d970dda637
79 changed files with 132 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Models/Form.php
View File

@@ -121,7 +121,7 @@ class Form extends Model {
}
static function getDefaultSuccessMessage() {
$settings = new SettingsController;
$settings = SettingsController::getInstance();
if ($settings->get('signup_confirmation.enabled')) {
return __('Check your inbox or spam folder to confirm your subscription.', 'mailpoet');
}

2
lib/Models/Newsletter.php
View File

@@ -1045,7 +1045,7 @@ class Newsletter extends Model {
static function createOrUpdate($data = []) {
$data['unsubscribe_token'] = Security::generateUnsubscribeToken(self::class);
return parent::_createOrUpdate($data, false, function($data) {
$settings = new SettingsController();
$settings = SettingsController::getInstance();
// set default sender based on settings
if (empty($data['sender'])) {
$sender = $settings->get('sender', []);

2
lib/Models/Setting.php
View File

@@ -46,7 +46,7 @@ class Setting extends Model {
}
public static function saveDefaultSenderIfNeeded($sender_address, $sender_name) {
$settings = new SettingsController();
$settings = SettingsController::getInstance();
if (empty($sender_address) || empty($sender_name) || $settings->get('sender')) {
return;
}

2
lib/Models/Subscriber.php
View File

@@ -787,7 +787,7 @@ class Subscriber extends Model {
}
static function setRequiredFieldsDefaultValues($data) {
$settings = new SettingsController();
$settings = SettingsController::getInstance();
$required_field_default_values = [
'first_name' => '',
'last_name' => '',