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

Remove 'type' parameter for view-in-browser, always include hash

Browse Source 
[MAILPOET-2430]
This commit is contained in:
Jan Jakeš
2020-02-04 15:54:06 +01:00
committed by Jack Kitterhing
parent eb1c7673e3
commit e5fcf5819d
9 changed files with 6 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,7 +124,6 @@ class Newsletters extends APIEndpoint {
NewslettersResponseBuilder::RELATION_QUEUE,
]);
$previewUrl = NewsletterUrl::getViewInBrowserUrl(
NewsletterUrl::TYPE_LISTING_EDITOR,
(object)[
'id' => $newsletter->getId(),
'hash' => $newsletter->getHash(),
@ -155,7 +154,6 @@ class Newsletters extends APIEndpoint {
]);
$response = $this->wp->applyFilters('mailpoet_api_newsletters_get_after', $response);
$response['preview_url'] = NewsletterUrl::getViewInBrowserUrl(
NewsletterUrl::TYPE_LISTING_EDITOR,
(object)[
'id' => $newsletter->getId(),
'hash' => $newsletter->getHash(),
@ -283,12 +281,7 @@ class Newsletters extends APIEndpoint {
$this->wp->doAction('mailpoet_api_newsletters_save_after', $newsletter);
$this->authorizedEmailsController->onNewsletterUpdate($newsletter, $oldNewsletter);
$previewUrl = NewsletterUrl::getViewInBrowserUrl(
NewsletterUrl::TYPE_LISTING_EDITOR,
$newsletter,
Subscriber::getCurrentWPUser()
);
$previewUrl = NewsletterUrl::getViewInBrowserUrl($newsletter, Subscriber::getCurrentWPUser());
return $this->successResponse($newsletter->asArray(), ['preview_url' => $previewUrl]);
}
@ -441,11 +434,7 @@ class Newsletters extends APIEndpoint {
$newsletter->body = $this->emoji->encodeForUTF8Column(MP_NEWSLETTERS_TABLE, 'body', $newsletter->body);
$newsletter->save();
$subscriber = Subscriber::getCurrentWPUser();
$previewUrl = NewsletterUrl::getViewInBrowserUrl(
NewsletterUrl::TYPE_LISTING_EDITOR,
$newsletter,
$subscriber
);
$previewUrl = NewsletterUrl::getViewInBrowserUrl($newsletter, $subscriber);
$publicPreviewUrl = NewsletterUrl::getViewInBrowserUrl($newsletter);
// strip protocol to avoid mix content error
$previewUrl = preg_replace('{^https?:}i', '', $previewUrl);
@ -575,12 +564,7 @@ class Newsletters extends APIEndpoint {
}
// get preview url
$newsletter->previewUrl = NewsletterUrl::getViewInBrowserUrl(
NewsletterUrl::TYPE_LISTING_EDITOR,
$newsletter,
$subscriber = null,
$queue
);
$newsletter->previewUrl = NewsletterUrl::getViewInBrowserUrl($newsletter, $subscriber = null, $queue);
$data[] = $this->wp->applyFilters('mailpoet_api_newsletters_listing_item', $newsletter->asArray());
}