Make $preview = true default for view-in-broser URL

[MAILPOET-2430]
This commit is contained in:
Jan Jakeš
2020-02-04 15:47:54 +01:00
committed by Jack Kitterhing
parent 2f59ab4c50
commit eb1c7673e3
5 changed files with 6 additions and 11 deletions

View File

@ -93,7 +93,8 @@ class Link {
$type = null,
$newsletter,
$subscriber,
$queue
$queue,
false
);
break;
default:

View File

@ -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

View File

@ -71,8 +71,7 @@ class NewslettersExporter {
'',
$newsletters[$statisticsRow['newsletter_id']],
$subscriber,
false,
true
false
),
];
}

View File

@ -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();

View File

@ -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