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

Use only one preview link in preview modal

Browse Source 
[MAILPOET-2430]
This commit is contained in:
Jan Jakeš
2020-02-11 09:51:35 +01:00
committed by Jack Kitterhing
parent 369675626c
commit b22198f599
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -433,21 +433,15 @@ class Newsletters extends APIEndpoint {
$newsletter->body = $data['body'];
$newsletter->body = $this->emoji->encodeForUTF8Column(MP_NEWSLETTERS_TABLE, 'body', $newsletter->body);
$newsletter->save();
$subscriber = Subscriber::getCurrentWPUser();
$previewUrl = NewsletterUrl::getViewInBrowserUrl($newsletter, $subscriber);
$publicPreviewUrl = NewsletterUrl::getViewInBrowserUrl($newsletter);
$previewUrl = NewsletterUrl::getViewInBrowserUrl($newsletter);
// strip protocol to avoid mix content error
$previewUrl = preg_replace('{^https?:}i', '', $previewUrl);
$publicPreviewUrl = preg_replace('{^https?:}i', '', $publicPreviewUrl);
$newsletter = Newsletter::findOne($newsletter->id);
if(!$newsletter instanceof Newsletter) return $this->errorResponse();
return $this->successResponse(
$newsletter->asArray(),
[
'preview_url' => $previewUrl,
'public_preview_url' => $publicPreviewUrl,
]
['preview_url' => $previewUrl]
);
} else {
return $this->errorResponse([