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

Validate for unsubscribe link only for MSS sending method [MAILPOET-1050]

Browse Source
This commit is contained in:
stoletniy
2017-08-30 10:00:14 +03:00
committed by pavel-mailpoet
parent 546e012fbf
commit cf992852b5
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Config/Menu.php
View File

@@ -541,7 +541,8 @@ class Menu {
'shortcodes' => ShortcodesHelper::getShortcodes(), 'shortcodes' => ShortcodesHelper::getShortcodes(),
'settings' => Setting::getAll(), 'settings' => Setting::getAll(),
'current_wp_user' => Subscriber::getCurrentWPUser(), 'current_wp_user' => Subscriber::getCurrentWPUser(),
'sub_menu' => self::MAIN_PAGE_SLUG 'sub_menu' => self::MAIN_PAGE_SLUG,
'mss_active' => Bridge::isMPSendingServiceEnabled()
); );
wp_enqueue_media(); wp_enqueue_media();
wp_enqueue_script('tinymce-wplink', includes_url('js/tinymce/plugins/wplink/plugin.js')); wp_enqueue_script('tinymce-wplink', includes_url('js/tinymce/plugins/wplink/plugin.js'));

2
views/newsletter/editor.html
View File

@@ -1200,7 +1200,7 @@
height: '768px' height: '768px'
}, },
validation: { validation: {
validateUnsubscribeLinkPresent: true, // TODO: Add validation based on whether Mailpoet MTA is used or not validateUnsubscribeLinkPresent: <%= mss_active ? 'true' : 'false' %>,
}, },
urls: { urls: {
send: '<%= admin_url('admin.php?page=mailpoet-newsletters#/send/' ~ (params('id') | intval)) %>', send: '<%= admin_url('admin.php?page=mailpoet-newsletters#/send/' ~ (params('id') | intval)) %>',