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

Refactor MailPoet\Model to use new settings

Browse Source 
[MAILPOET-1757]
This commit is contained in:
Rostislav Wolny
2019-01-30 13:59:44 +01:00
parent f4f1770b1d
commit 3a7ea60d3f
5 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Models/Newsletter.php
View File

@ -2,6 +2,7 @@
namespace MailPoet\Models;
use Carbon\Carbon;
use MailPoet\Newsletter\Renderer\Renderer;
use MailPoet\Settings\SettingsController;
use MailPoet\Tasks\Sending as SendingTask;
use MailPoet\Util\Helpers;
use MailPoet\Util\Security;
@ -935,9 +936,10 @@ class Newsletter extends Model {
static function createOrUpdate($data = array()) {
return parent::_createOrUpdate($data, false, function($data) {
$settings = new SettingsController();
// set default sender based on settings
if(empty($data['sender'])) {
$sender = Setting::getValue('sender', array());
$sender = $settings->get('sender', []);
$data['sender_name'] = (
!empty($sender['name'])
? $sender['name']
@ -952,7 +954,7 @@ class Newsletter extends Model {
// set default reply_to based on settings
if(empty($data['reply_to'])) {
$reply_to = Setting::getValue('reply_to', array());
$reply_to = $settings->get('reply_to', array());
$data['reply_to_name'] = (
!empty($reply_to['name'])
? $reply_to['name']