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

Replace unsubscribe link short code strings by constant

Browse Source 
[MAILPOET-2245]
This commit is contained in:
Rostislav Wolny
2019-10-01 10:08:40 +02:00
committed by Jack Kitterhing
parent 6ae61a3e9b
commit 4fbf8ed7be
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Cron/Workers/SendingQueue/Tasks/Links.php
View File

@ -42,7 +42,7 @@ class Links {
$settings = new SettingsController(); $settings = new SettingsController();
if ((boolean)$settings->get('tracking.enabled')) { if ((boolean)$settings->get('tracking.enabled')) {
$link_hash = NewsletterLinkModel::where('queue_id', $queue->id) $link_hash = NewsletterLinkModel::where('queue_id', $queue->id)
->where('url', '[link:subscription_unsubscribe_url]') ->where('url', NewsletterLinkModel::UNSUBSCRIBE_LINK_SHORT_CODE)
->findOne(); ->findOne();
if (!$link_hash instanceof NewsletterLinkModel) { if (!$link_hash instanceof NewsletterLinkModel) {
return ''; return '';

2
lib/Cron/Workers/StatsNotifications/Worker.php
View File

@ -157,7 +157,7 @@ class Worker {
public static function getShortcodeLinksMapping() { public static function getShortcodeLinksMapping() {
return [ return [
'[link:subscription_unsubscribe_url]' => __('Unsubscribe link', 'mailpoet'), NewsletterLink::UNSUBSCRIBE_LINK_SHORT_CODE => __('Unsubscribe link', 'mailpoet'),
'[link:subscription_manage_url]' => __('Manage subscription link', 'mailpoet'), '[link:subscription_manage_url]' => __('Manage subscription link', 'mailpoet'),
'[link:newsletter_view_in_browser_url]' => __('View in browser link', 'mailpoet'), '[link:newsletter_view_in_browser_url]' => __('View in browser link', 'mailpoet'),
]; ];

3
lib/Newsletter/Shortcodes/ShortcodesHelper.php
View File

@ -3,6 +3,7 @@
namespace MailPoet\Newsletter\Shortcodes; namespace MailPoet\Newsletter\Shortcodes;
use MailPoet\Models\CustomField; use MailPoet\Models\CustomField;
use MailPoet\Models\NewsletterLink;
use MailPoet\WP\Functions as WPFunctions; use MailPoet\WP\Functions as WPFunctions;
class ShortcodesHelper { class ShortcodesHelper {
@ -82,7 +83,7 @@ class ShortcodesHelper {
'text' => WPFunctions::get()->__('Unsubscribe link', 'mailpoet'), 'text' => WPFunctions::get()->__('Unsubscribe link', 'mailpoet'),
'shortcode' => sprintf( 'shortcode' => sprintf(
'<a target="_blank" href="%s">%s</a>', '<a target="_blank" href="%s">%s</a>',
'[link:subscription_unsubscribe_url]', NewsletterLink::UNSUBSCRIBE_LINK_SHORT_CODE,
WPFunctions::get()->__('Unsubscribe', 'mailpoet') WPFunctions::get()->__('Unsubscribe', 'mailpoet')
), ),
], ],