From af9cdc3e4152f200fe6a660965ed4f87dd981e12 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Thu, 9 Dec 2021 14:58:54 +0200
Subject: [PATCH] Fixed deprecation warnings on taxonomy and xss fields

---
 .../grav/templates/forms/fields/taxonomy/taxonomy.html.twig   | 3 ++-
 themes/grav/templates/forms/fields/xss/xss.html.twig          | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/themes/grav/templates/forms/fields/taxonomy/taxonomy.html.twig b/themes/grav/templates/forms/fields/taxonomy/taxonomy.html.twig
index 64d5434d..fbb925e1 100644
--- a/themes/grav/templates/forms/fields/taxonomy/taxonomy.html.twig
+++ b/themes/grav/templates/forms/fields/taxonomy/taxonomy.html.twig
@@ -9,7 +9,8 @@
 
 {% for name in taxonomies %}
     {% set field_name = parentname ~ '.' ~ name %}
-    {% set value = (form.value(field_name) ?? data.value(field_name) ?? default[name] ?? [])|array %}
+    {% set value = form ? form.value(field_name) : data.value(field_name) %}
+    {% set value = (value ?? default[name] ?? [])|array %}
     {% if object %}
         {% set can_translate = can_translate ?? (admin.multilang and object.hasFlexFeature('flex-translate')) %}
         {% set index = object.getFlexDirectory().getIndex() %}
diff --git a/themes/grav/templates/forms/fields/xss/xss.html.twig b/themes/grav/templates/forms/fields/xss/xss.html.twig
index ec9795dd..76c5ac1f 100644
--- a/themes/grav/templates/forms/fields/xss/xss.html.twig
+++ b/themes/grav/templates/forms/fields/xss/xss.html.twig
@@ -1,5 +1,5 @@
-{% set xss_header = data.value('header')|array %}
-{% set xss_content = data.value('content') %}
+{% set xss_header = (form ? form.value('header') : data.value('header'))|array %}
+{% set xss_content = form ? form.value('content') : data.value('content') %}
 {% set xss_status = xss({header: xss_header, content: xss_content}) %}
 {% if xss_status is not empty %}
     <div class="notice alert">{{ "PLUGIN_ADMIN.XSS_ISSUE"|t(xss_status)|raw }}</div>