diff --git a/lib/API/JSON/v1/Newsletters.php b/lib/API/JSON/v1/Newsletters.php index 607a5e0557..023ab89757 100644 --- a/lib/API/JSON/v1/Newsletters.php +++ b/lib/API/JSON/v1/Newsletters.php @@ -564,7 +564,7 @@ class Newsletters extends APIEndpoint { } // 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()); } diff --git a/lib/Newsletter/Shortcodes/Categories/Link.php b/lib/Newsletter/Shortcodes/Categories/Link.php index 211ae9d4e2..455cf5b3b6 100644 --- a/lib/Newsletter/Shortcodes/Categories/Link.php +++ b/lib/Newsletter/Shortcodes/Categories/Link.php @@ -40,7 +40,7 @@ class Link { case 'newsletter_view_in_browser_url': $url = NewsletterUrl::getViewInBrowserUrl( $newsletter, - $wpUserPreview ? false : $subscriber, + $wpUserPreview ? null : $subscriber, $queue, $wpUserPreview ); diff --git a/lib/Subscribers/ImportExport/PersonalDataExporters/NewslettersExporter.php b/lib/Subscribers/ImportExport/PersonalDataExporters/NewslettersExporter.php index 9208b8da98..175ba321c6 100644 --- a/lib/Subscribers/ImportExport/PersonalDataExporters/NewslettersExporter.php +++ b/lib/Subscribers/ImportExport/PersonalDataExporters/NewslettersExporter.php @@ -69,8 +69,7 @@ class NewslettersExporter { 'name' => WPFunctions::get()->__('Email preview', 'mailpoet'), 'value' => Url::getViewInBrowserUrl( $newsletters[$statisticsRow['newsletter_id']], - $subscriber, - false + $subscriber ), ]; } diff --git a/tests/integration/API/JSON/v1/NewslettersTest.php b/tests/integration/API/JSON/v1/NewslettersTest.php index 911bb45cc9..fafa2d66de 100644 --- a/tests/integration/API/JSON/v1/NewslettersTest.php +++ b/tests/integration/API/JSON/v1/NewslettersTest.php @@ -873,7 +873,7 @@ class NewslettersTest extends \MailPoetTest { 'send' => function ($newsletter, $subscriber, $extraParams) { $unsubscribeLink = $this->subscriptionUrlFactory->getUnsubscribeUrl(null); $manageLink = $this->subscriptionUrlFactory->getManageUrl(null); - $viewInBrowserLink = Url::getViewInBrowserUrl($this->newsletter, false, false); + $viewInBrowserLink = Url::getViewInBrowserUrl($this->newsletter); $mailerMetaInfo = new MetaInfo; expect(is_array($newsletter))->true(); diff --git a/tests/integration/Newsletter/ShortcodesTest.php b/tests/integration/Newsletter/ShortcodesTest.php index 3c628cf55e..f9d38a13a0 100644 --- a/tests/integration/Newsletter/ShortcodesTest.php +++ b/tests/integration/Newsletter/ShortcodesTest.php @@ -309,7 +309,7 @@ class ShortcodesTest extends \MailPoetTest { $links = [ $this->subscriptionUrlFactory->getUnsubscribeUrl(null), $this->subscriptionUrlFactory->getManageUrl(null), - NewsletterUrl::getViewInBrowserUrl($this->newsletter, false, false), + NewsletterUrl::getViewInBrowserUrl($this->newsletter), ]; $result = $shortcodesObject->process($shortcodes); // hash is returned