diff --git a/lib/Newsletter/Shortcodes/Categories/Link.php b/lib/Newsletter/Shortcodes/Categories/Link.php index 290479cbc0..04fc59d759 100644 --- a/lib/Newsletter/Shortcodes/Categories/Link.php +++ b/lib/Newsletter/Shortcodes/Categories/Link.php @@ -93,7 +93,8 @@ class Link { $type = null, $newsletter, $subscriber, - $queue + $queue, + false ); break; default: diff --git a/lib/Newsletter/Url.php b/lib/Newsletter/Url.php index 690023f1fc..9fddcfbbc9 100644 --- a/lib/Newsletter/Url.php +++ b/lib/Newsletter/Url.php @@ -16,7 +16,7 @@ class Url { $newsletter, $subscriber = false, $queue = false, - $preview = false + bool $preview = true ) { $linkTokens = new LinkTokens; if ($subscriber instanceof SubscriberModel) { @@ -26,11 +26,6 @@ class Url { case self::TYPE_ARCHIVE: // do not expose newsletter id when displaying archive newsletters $newsletter->id = null; - $preview = true; - break; - case self::TYPE_LISTING_EDITOR: - // enable preview when displaying from editor or listings - $preview = true; break; default: // hide hash for all other display types diff --git a/lib/Subscribers/ImportExport/PersonalDataExporters/NewslettersExporter.php b/lib/Subscribers/ImportExport/PersonalDataExporters/NewslettersExporter.php index e38507f018..f67d683fc6 100644 --- a/lib/Subscribers/ImportExport/PersonalDataExporters/NewslettersExporter.php +++ b/lib/Subscribers/ImportExport/PersonalDataExporters/NewslettersExporter.php @@ -71,8 +71,7 @@ class NewslettersExporter { '', $newsletters[$statisticsRow['newsletter_id']], $subscriber, - false, - true + false ), ]; } diff --git a/tests/integration/API/JSON/v1/NewslettersTest.php b/tests/integration/API/JSON/v1/NewslettersTest.php index 6f3b6a3352..8276485f1b 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(null, $this->newsletter, false, false, true); + $viewInBrowserLink = Url::getViewInBrowserUrl(null, $this->newsletter, false, false); $mailerMetaInfo = new MetaInfo; expect(is_array($newsletter))->true(); diff --git a/tests/integration/Newsletter/ShortcodesTest.php b/tests/integration/Newsletter/ShortcodesTest.php index cb5f0e9ab2..441b9e725e 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(null, $this->newsletter, false, false, true), + NewsletterUrl::getViewInBrowserUrl(null, $this->newsletter, false, false), ]; $result = $shortcodesObject->process($shortcodes); // hash is returned