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

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

Browse Source 
[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
Download Patch File Download Diff File Expand all files Collapse all files

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

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

7
lib/Newsletter/Url.php
View File

@ -16,7 +16,7 @@ class Url {
$newsletter, $newsletter,
$subscriber = false, $subscriber = false,
$queue = false, $queue = false,
$preview = false bool $preview = true
) { ) {
$linkTokens = new LinkTokens; $linkTokens = new LinkTokens;
if ($subscriber instanceof SubscriberModel) { if ($subscriber instanceof SubscriberModel) {
@ -26,11 +26,6 @@ class Url {
case self::TYPE_ARCHIVE: case self::TYPE_ARCHIVE:
// do not expose newsletter id when displaying archive newsletters // do not expose newsletter id when displaying archive newsletters
$newsletter->id = null; $newsletter->id = null;
$preview = true;
break;
case self::TYPE_LISTING_EDITOR:
// enable preview when displaying from editor or listings
$preview = true;
break; break;
default: default:
// hide hash for all other display types // hide hash for all other display types

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

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

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(null, $this->newsletter, false, false, true); $viewInBrowserLink = Url::getViewInBrowserUrl(null, $this->newsletter, false, false);
$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(null, $this->newsletter, false, false, true), NewsletterUrl::getViewInBrowserUrl(null, $this->newsletter, false, false),
]; ];
$result = $shortcodesObject->process($shortcodes); $result = $shortcodesObject->process($shortcodes);
// hash is returned // hash is returned