Merge branch 'commercial-hippie/5.x' into 5.5

brandonkelly · brandonkelly · commit aea88ef09b37 · 2024-10-21T11:26:31.000-07:00
Resolves #15932
diff --git a/CHANGELOG-WIP.md b/CHANGELOG-WIP.md
@@ -55,6 +55,7 @@
 - Added `craft\web\View::registerSiteTwigExtension()`.
 - Added `craft\helpers\Console::$outputCount`.
 - Added `craft\helpers\Console::$prependNewline`.
+- Added `craft\fieldlayoutelements\Template::$templateMode`. ([#15932](https://github.com/craftcms/cms/pull/15932))
 - `craft\helpers\Console::output()` now prepends an indent to each line of the passed-in string, if `indent()` had been called prior.
 - Deprecated the `enableBasicHttpAuth` config setting. `craft\filters\BasicHttpAuthLogin` should be used instead. ([#15720](https://github.com/craftcms/cms/pull/15720))
 - Added the `serializeForm` event to `Craft.ElementEditor`. ([#15794](https://github.com/craftcms/cms/discussions/15794))
diff --git a/src/fieldlayoutelements/Template.php b/src/fieldlayoutelements/Template.php
@@ -27,6 +27,12 @@ class Template extends BaseUiElement
      */
     public string $template = '';
 
+    /**
+     * @var string The template mode to use when loading the template.
+     * @since 5.5.0
+     */
+    public string $templateMode = View::TEMPLATE_MODE_SITE;
+
     /**
      * @inheritdoc
      */
@@ -100,7 +106,7 @@ public function formHtml(?ElementInterface $element = null, bool $static = false
             $content = trim(Craft::$app->getView()->renderTemplate($this->template, [
                 'element' => $element,
                 'static' => $static,
-            ], View::TEMPLATE_MODE_SITE));
+            ], $this->templateMode));
         } catch (Throwable $e) {
             return $this->_error($e->getMessage(), 'error');
         }
