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

Remove Newsletter model usages

Browse Source 
[MAILPOET-4361]
This commit is contained in:
Sam Najian
2022-07-07 14:52:30 +02:00
committed by Veljko V
parent 7e6b6eac35
commit bd3b4f1e93
6 changed files with 14 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mailpoet/lib/API/JSON/ResponseBuilders/NewslettersResponseBuilder.php
View File

@@ -138,14 +138,11 @@ class NewslettersResponseBuilder {
? $statistics->asArray()
: false,
'preview_url' => $this->newsletterUrl->getViewInBrowserUrl(
(object)[
'id' => $newsletter->getId(),
'hash' => $newsletter->getHash(),
],
$newsletter,
null,
in_array($newsletter->getStatus(), [NewsletterEntity::STATUS_SENT, NewsletterEntity::STATUS_SENDING], true)
? $latestQueue
: false
: null
),
];

8
mailpoet/lib/API/JSON/v1/Newsletters.php
View File

@@ -399,13 +399,7 @@ class Newsletters extends APIEndpoint {
private function getViewInBrowserUrl(NewsletterEntity $newsletter): string {
$this->fixMissingHash([$newsletter]); // Fix for MAILPOET-3275. Remove after May 2021
$url = $this->newsletterUrl->getViewInBrowserUrl(
(object)[
'id' => $newsletter->getId(),
'hash' => $newsletter->getHash(),
]
);
$url = $this->newsletterUrl->getViewInBrowserUrl($newsletter);
// strip protocol to avoid mix content error
return preg_replace('/^https?:/i', '', $url);
}