- Optimizes ViewInBrowser router endpoint

- Optimizes ViewInBrowser class
- Optimizes and updates shortcode link category to use the refactored
  getViewInBrowserUrl() method
- Updates Shortcodes to use the refactored getViewInBrowserUrl() method
This commit is contained in:
Vlad
2016-12-12 21:43:52 -05:00
parent 707afc2ae0
commit 9698cf2d2e
6 changed files with 87 additions and 49 deletions

View File

@ -32,7 +32,7 @@ class Shortcodes {
), 2);
add_filter('mailpoet_archive_subject', array(
$this, 'renderArchiveSubject'
), 2);
), 2, 3);
}
function formWidget($params = array()) {
@ -77,6 +77,8 @@ class Shortcodes {
$newsletters = Newsletter::getArchives($segment_ids);
$subscriber = Subscriber::getCurrentWPUser();
if(empty($newsletters)) {
return apply_filters(
'mailpoet_archive_no_newsletters',
@ -90,12 +92,13 @@ class Shortcodes {
$html .= '<ul class="mailpoet_archive">';
foreach($newsletters as $newsletter) {
$queue = $newsletter->queue()->findOne();
$html .= '<li>'.
'<span class="mailpoet_archive_date">'.
apply_filters('mailpoet_archive_date', $newsletter).
'</span>
<span class="mailpoet_archive_subject">'.
apply_filters('mailpoet_archive_subject', $newsletter).
apply_filters('mailpoet_archive_subject', $newsletter, $subscriber, $queue).
'</span>
</li>';
}
@ -111,14 +114,13 @@ class Shortcodes {
);
}
function renderArchiveSubject($newsletter) {
function renderArchiveSubject($newsletter, $subscriber, $queue) {
$preview_url = NewsletterUrl::getViewInBrowserUrl(
NewsletterUrl::TYPE_ARCHIVE,
$newsletter,
$subscriber = false,
$queue = false,
$wp_user_preview = true
$subscriber,
$queue
);
return '<a href="'.esc_attr($preview_url).'" target="_blank" title="'
.esc_attr(__('Preview in a new tab', 'mailpoet')).'">'
.esc_attr($newsletter->subject).