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

Refactor MailPoet\Newsletter to use new settings

Browse Source 
[MAILPOET-1757]
This commit is contained in:
Rostislav Wolny
2019-01-30 14:00:04 +01:00
parent 3a7ea60d3f
commit fce709a7fc
5 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Newsletter/Shortcodes/Categories/Link.php
View File

@@ -2,8 +2,8 @@
namespace MailPoet\Newsletter\Shortcodes\Categories;
use MailPoet\Models\Setting;
use MailPoet\Newsletter\Url as NewsletterUrl;
use MailPoet\Settings\SettingsController;
use MailPoet\Statistics\Track\Unsubscribes;
use MailPoet\Subscription\Url as SubscriptionUrl;
@@ -63,7 +63,8 @@ class Link {
static function processUrl($action, $url, $queue, $wp_user_preview = false) {
if($wp_user_preview) return $url;
return ($queue !== false && (boolean)Setting::getValue('tracking.enabled')) ?
$settings = new SettingsController();
return ($queue !== false && (boolean)$settings->get('tracking.enabled')) ?
self::getFullShortcode($action) :
$url;
}
@@ -73,8 +74,9 @@ class Link {
) {
switch($shortcode_action) {
case 'subscription_unsubscribe_url':
$settings = new SettingsController();
// track unsubscribe event
if((boolean)Setting::getValue('tracking.enabled') && !$wp_user_preview) {
if((boolean)$settings->get('tracking.enabled') && !$wp_user_preview) {
$unsubscribe_event = new Unsubscribes();
$unsubscribe_event->track($newsletter->id, $subscriber->id, $queue->id);
}