Stop forcing https for preview targets

Resolves #4867
craftcms · Sep 3, 2019 · 80e7cfe · 80e7cfe
1 parent 93e3c02
commit 80e7cfe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
@@ -13,6 +13,7 @@
 - Templates passed to `craft\web\View::renderString()` and `renderObjectTemplate()` can now incude front-end templates.
 - Element queries with the `revisions` param set will now return revisions ordered by `num DESC` by default. ([#4825](https://github.com/craftcms/cms/issues/4825))
 - `graphql/api` responses now set the `Access-Control-Allow-Headers: Content-Type` header for preflight requests.
+- Craft no longer forces preview target URLs to use `https` if the current request is over SSL. ([#4867](https://github.com/craftcms/cms/issues/4867))
 
 ### Fixed
 - Fixed a bug where Number fields weren’t showing validation errors when non-numeric values were entered. ([#4849](https://github.com/craftcms/cms/issues/4849))

diff --git a/src/base/Element.php b/src/base/Element.php
@@ -1457,15 +1457,14 @@ public function getPreviewTargets(): array
         }
 
         // Normalize the URLs
-        $scheme = Craft::$app->getRequest()->getIsSecureConnection() ? 'https' : null;
         $view = Craft::$app->getView();
         foreach ($previewTargets as &$previewTarget) {
             // urlFormat => url
             if (isset($previewTarget['urlFormat'])) {
                 $previewTarget['url'] = $view->renderObjectTemplate(Craft::parseEnv($previewTarget['urlFormat']), $this);
                 unset($previewTarget['urlFormat']);
             }
-            $previewTarget['url'] = UrlHelper::siteUrl($previewTarget['url'], null, $scheme, $this->siteId);
+            $previewTarget['url'] = UrlHelper::siteUrl($previewTarget['url'], null, null, $this->siteId);
         }
 
         return $previewTargets;