Merge pull request #3 from bolt/hotfix/extra-safeguards-sub_fields

Some extra safeguards against exceptions in "strict" mode.
bolt · Jul 24, 2017 · ee46f5d · ee46f5d
2 parents 6ca9360 + e92cfce
commit ee46f5d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/base-2016/partials/_sub_field_blocks.twig b/base-2016/partials/_sub_field_blocks.twig
@@ -41,7 +41,7 @@
     {% endif %}
 
     {# Image fields #}
-    {% if fieldtype == "image" %}
+    {% if fieldtype == "image" and value.file|default is not empty %}
         {{ popup(value, 1200, 0) }}
     {% endif %}
 
@@ -58,7 +58,7 @@
 {% block extended_fields %}
 
     {# Geolocation field #}
-    {% if fieldtype == "geolocation" and value.latitude is defined %}
+    {% if fieldtype == "geolocation" and value.latitude|default is not empty %}
         <img src="http://maps.googleapis.com/maps/api/staticmap?center={{ value.latitude }},{{ value.longitude }}&amp;zoom=14&amp;size=617x300&amp;sensor=false&amp;markers={{ value.latitude }},{{ value.longitude }}">
     {% endif %}
 

diff --git a/skeleton/partials/_sub_field_blocks.twig b/skeleton/partials/_sub_field_blocks.twig
@@ -41,7 +41,7 @@
     {% endif %}
 
     {# Image fields #}
-    {% if fieldtype == "image" and value['file'] is not empty %}
+    {% if fieldtype == "image" and value.file|default is not empty %}
         {{ value|showimage('684') }}
     {% endif %}
 
@@ -58,7 +58,7 @@
 {% block extended_fields %}
 
     {# Geolocation field #}
-    {% if fieldtype == "geolocation" and value.latitude is defined %}
+    {% if fieldtype == "geolocation" and value.latitude|default is not empty %}
         <img src="http://maps.googleapis.com/maps/api/staticmap?center={{ value.latitude }},{{ value.longitude }}&amp;zoom=14&amp;size=617x300&amp;sensor=false&amp;markers={{ value.latitude }},{{ value.longitude }}">
     {% endif %}