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

Remove old Setting model usage from Newsletters API

Browse Source 
[MAILPOET-2436]
This commit is contained in:
Jan Jakeš
2019-10-28 15:47:21 +01:00
committed by Jack Kitterhing
parent 4779506f82
commit 4907d01b8e
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/API/JSON/v1/Newsletters.php
View File

@ -17,7 +17,6 @@ use MailPoet\Models\NewsletterOptionField;
use MailPoet\Models\NewsletterSegment;
use MailPoet\Models\NewsletterTemplate;
use MailPoet\Models\SendingQueue;
use MailPoet\Models\Setting;
use MailPoet\Models\Subscriber;
use MailPoet\Newsletter\NewslettersRepository;
use MailPoet\Newsletter\Renderer\Renderer;
@ -205,8 +204,12 @@ class Newsletters extends APIEndpoint {
}
}
if (isset($data['sender_address']) && isset($data['sender_name'])) {
Setting::saveDefaultSenderIfNeeded($data['sender_address'], $data['sender_name']);
// save default sender if needed
if (!$this->settings->get('sender') && !empty($data['sender_address']) && !empty($data['sender_name'])) {
$this->settings->set('sender', [
'address' => $data['sender_address'],
'name' => $data['sender_name'],
]);
}
if (!empty($options)) {

11
lib/Models/Setting.php
View File

@ -44,15 +44,4 @@ class Setting extends Model {
$value = self::where('name', $value)->findOne();
return ($value) ? $value->delete() : false;
}
public static function saveDefaultSenderIfNeeded($sender_address, $sender_name) {
$settings = SettingsController::getInstance();
if (empty($sender_address) || empty($sender_name) || $settings->get('sender')) {
return;
}
$settings->set('sender', [
'address' => $sender_address,
'name' => $sender_name,
]);
}
}