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

Simplify and unify getViewInBroserUrl calls

Browse Source 
[MAILPOET-2430]
This commit is contained in:
Jan Jakeš
2020-02-04 16:02:26 +01:00
committed by Jack Kitterhing
parent e5fcf5819d
commit 923dc0d1dd
5 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/API/JSON/v1/Newsletters.php
View File

@ -564,7 +564,7 @@ class Newsletters extends APIEndpoint {
} }
// get preview url // get preview url
$newsletter->previewUrl = NewsletterUrl::getViewInBrowserUrl($newsletter, $subscriber = null, $queue); $newsletter->previewUrl = NewsletterUrl::getViewInBrowserUrl($newsletter, null, $queue);
$data[] = $this->wp->applyFilters('mailpoet_api_newsletters_listing_item', $newsletter->asArray()); $data[] = $this->wp->applyFilters('mailpoet_api_newsletters_listing_item', $newsletter->asArray());
} }

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

@ -40,7 +40,7 @@ class Link {
case 'newsletter_view_in_browser_url': case 'newsletter_view_in_browser_url':
$url = NewsletterUrl::getViewInBrowserUrl( $url = NewsletterUrl::getViewInBrowserUrl(
$newsletter, $newsletter,
$wpUserPreview ? false : $subscriber, $wpUserPreview ? null : $subscriber,
$queue, $queue,
$wpUserPreview $wpUserPreview
); );

3
lib/Subscribers/ImportExport/PersonalDataExporters/NewslettersExporter.php
View File

@ -69,8 +69,7 @@ class NewslettersExporter {
'name' => WPFunctions::get()->__('Email preview', 'mailpoet'), 'name' => WPFunctions::get()->__('Email preview', 'mailpoet'),
'value' => Url::getViewInBrowserUrl( 'value' => Url::getViewInBrowserUrl(
$newsletters[$statisticsRow['newsletter_id']], $newsletters[$statisticsRow['newsletter_id']],
$subscriber, $subscriber
false
), ),
]; ];
} }

2
tests/integration/API/JSON/v1/NewslettersTest.php
View File

@ -873,7 +873,7 @@ class NewslettersTest extends \MailPoetTest {
'send' => function ($newsletter, $subscriber, $extraParams) { 'send' => function ($newsletter, $subscriber, $extraParams) {
$unsubscribeLink = $this->subscriptionUrlFactory->getUnsubscribeUrl(null); $unsubscribeLink = $this->subscriptionUrlFactory->getUnsubscribeUrl(null);
$manageLink = $this->subscriptionUrlFactory->getManageUrl(null); $manageLink = $this->subscriptionUrlFactory->getManageUrl(null);
$viewInBrowserLink = Url::getViewInBrowserUrl($this->newsletter, false, false); $viewInBrowserLink = Url::getViewInBrowserUrl($this->newsletter);
$mailerMetaInfo = new MetaInfo; $mailerMetaInfo = new MetaInfo;
expect(is_array($newsletter))->true(); expect(is_array($newsletter))->true();

2
tests/integration/Newsletter/ShortcodesTest.php
View File

@ -309,7 +309,7 @@ class ShortcodesTest extends \MailPoetTest {
$links = [ $links = [
$this->subscriptionUrlFactory->getUnsubscribeUrl(null), $this->subscriptionUrlFactory->getUnsubscribeUrl(null),
$this->subscriptionUrlFactory->getManageUrl(null), $this->subscriptionUrlFactory->getManageUrl(null),
NewsletterUrl::getViewInBrowserUrl($this->newsletter, false, false), NewsletterUrl::getViewInBrowserUrl($this->newsletter),
]; ];
$result = $shortcodesObject->process($shortcodes); $result = $shortcodesObject->process($shortcodes);
// hash is returned // hash is returned