From 0e3661b45d6da10bde1cf452e7004f9f320fcaa4 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Fri, 19 Jul 2019 16:12:15 +0300
Subject: [PATCH] Minor twig cleanup

---
 themes/grav/templates/forms/field.html.twig                | 2 +-
 themes/grav/templates/forms/fields/editor/editor.html.twig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/grav/templates/forms/field.html.twig b/themes/grav/templates/forms/field.html.twig
index e0aa0280..57d280cc 100644
--- a/themes/grav/templates/forms/field.html.twig
+++ b/themes/grav/templates/forms/field.html.twig
@@ -4,7 +4,7 @@
     {% set originalValue = originalValue is defined ? originalValue : value %}
     {% set toggleableChecked = field.toggleable and (originalValue is not null and originalValue is not empty) %}
     {% set isDisabledToggleable = field.toggleable and not toggleableChecked %}
-    {% set value = (value is null ? field.default : value) %}
+    {% set value = value ?? field.default %}
 
     {% if (field.yaml or field.validate.type == 'yaml') and value is iterable%}
         {% set value = value|toYaml %}
diff --git a/themes/grav/templates/forms/fields/editor/editor.html.twig b/themes/grav/templates/forms/fields/editor/editor.html.twig
index 85cb76d0..28074999 100644
--- a/themes/grav/templates/forms/fields/editor/editor.html.twig
+++ b/themes/grav/templates/forms/fields/editor/editor.html.twig
@@ -1,6 +1,6 @@
 {% extends "forms/field.html.twig" %}
 
-{% set value = (value is null ? field.default|tu : value) %}
+{% set value = value ?? field.default|tu %}
 {% if not codemirrorOptions %}
     {% set codemirrorOptions = {'mode': 'gfm', 'ignore': ['code', 'preview']}|merge(field.codemirror|default({})) %}
 {% endif %}