Added the isWebRequest variable

putyourlightson · Aug 9, 2021 · 175911f · 175911f
1 parent fc1e4ed
commit 175911f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release Notes for Campaign
 
+## 1.20.3 - Unreleased
+### Added
+- Added the `isWebRequest` variable to campaign templates that evaluates to `true` if the campaign is being viewed via a web request using the browser URL ([#246](https://github.com/putyourlightson/craft-campaign/issues/246)).
+
 ## 1.20.2 - 2021-08-05
 ### Fixed
 - Fixed a bug in which segments were not working with fields created in Craft 3.7.0 and above ([#241](https://github.com/putyourlightson/craft-campaign/issues/241)).

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "putyourlightson/craft-campaign",
     "description": "Send and manage email campaigns, contacts and mailing lists.",
-    "version": "1.20.2",
+    "version": "1.20.3",
     "type": "craft-plugin",
     "homepage": "https://putyourlightson.com/plugins/campaign",
     "license": "proprietary",

diff --git a/src/controllers/CampaignsController.php b/src/controllers/CampaignsController.php
@@ -215,11 +215,9 @@ public function actionPreviewCampaign(): Response
             Craft::$app->getElements()->setPlaceholderElement($campaign);
         }
 
-        $this->getView()->getTwig()->disableStrictVariables();
+        $this->response->data = $campaign->getHtmlBody();
 
-        return $this->renderTemplate($campaign->getCampaignType()->htmlTemplate, [
-            'campaign' => $campaign
-        ]);
+        return $this->response;
     }
 
     /**

diff --git a/src/elements/CampaignElement.php b/src/elements/CampaignElement.php
@@ -394,6 +394,7 @@ protected function route()
                     'browserVersionUrl' => $this->url,
                     'contact' => new ContactElement(),
                     'unsubscribeUrl' => '',
+                    'isWebRequest' => true,
                 ]
             ]
         ];
@@ -652,6 +653,7 @@ private function _getBody(string $templateType = null, ContactElement $contact =
                 'contact' => $contact,
                 'sendout' => $sendout,
                 'unsubscribeUrl' => $contact->getUnsubscribeUrl($sendout),
+                'isWebRequest' => false,
             ]);
         }
         catch (Error $exception) {