From ac41a3a57a9274c96d64ef0ce9643406deff685e Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Mon, 27 Aug 2018 11:22:52 +0300
Subject: [PATCH] Twig 2 compatibility fixes on macros (part 2)

---
 .../forms/fields/multilevel/multilevel.html.twig   | 14 ++++++++------
 themes/grav/templates/pages.html.twig              |  4 +++-
 .../partials/media-list-wrapper__sidebar.html.twig |  4 +++-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/themes/grav/templates/forms/fields/multilevel/multilevel.html.twig b/themes/grav/templates/forms/fields/multilevel/multilevel.html.twig
index 4545c387..a13701d6 100644
--- a/themes/grav/templates/forms/fields/multilevel/multilevel.html.twig
+++ b/themes/grav/templates/forms/fields/multilevel/multilevel.html.twig
@@ -1,6 +1,8 @@
 {% extends "forms/field.html.twig" %}
 
 {% macro renderer(key, content, field, scope, level, parent_key, up_level) %}
+    {% import _self as self %}
+
     {% macro field(value, key, level, globalvars, disable_name, hidden) %}
         {% set name = 'data[' ~ globalvars.field.name|replace({'.': ']['}) ~ ']' ~ key %}
         <div class="form-row array-field-value_only js__multilevel-field {{ level == 0 ? 'top' : '' }}"
@@ -21,14 +23,14 @@
 
     {% if level == 0 %}
 
-        {{ macro.field(key, '', level, _context, true, (is_numeric(key) ? true : false)) }}
+        {{ self.field(key, '', level, _context, true, (is_numeric(key) ? true : false)) }}
 
         {% if content is not iterable %}
             {% set level2 = level + 1 %}
 
             <div class="children-wrapper">
                 <div class="element-wrapper">
-                    {{ macro.field(content, '[' ~ key ~ ']', level2, _context) }}
+                    {{ self.field(content, '[' ~ key ~ ']', level2, _context) }}
                 </div>
             </div>
         {% endif %}
@@ -44,9 +46,9 @@
             <div class="element-wrapper">
                 {% if not is_numeric(inner_key) %}
                     {% if (content|length > 1) %}
-                        {{ macro.field(inner_key, parent_key, level, _context, true) }}
+                        {{ self.field(inner_key, parent_key, level, _context, true) }}
                     {% else %}
-                        {{ macro.field(inner_key, parent_key, level, _context) }}
+                        {{ self.field(inner_key, parent_key, level, _context) }}
                     {% endif %}
                     {% set level2 = level + 1 %}
                     {% set up_level = true %}
@@ -63,7 +65,7 @@
                     {% endif %}
 
                     {% set last_key = (is_numeric(inner_key)) ? '' : inner_key %}
-                    {{ macro.field(inner_content, parent_key ~ '[' ~ inner_key ~ ']', level2, _context) }}
+                    {{ self.field(inner_content, parent_key ~ '[' ~ inner_key ~ ']', level2, _context) }}
 
                     {% if not is_numeric(inner_key) %}
                             </div>
@@ -72,7 +74,7 @@
                 {% else %}
 
                     {% set inner_parent_key = parent_key ~ '[' ~ inner_key ~ ']' %}
-                    {{ macro.renderer(inner_key, inner_content, field, scope, level, inner_parent_key, up_level) }}
+                    {{ self.renderer(inner_key, inner_content, field, scope, level, inner_parent_key, up_level) }}
                 {% endif %}
             </div>
         {% endfor %}
diff --git a/themes/grav/templates/pages.html.twig b/themes/grav/templates/pages.html.twig
index 472d1b92..8e306109 100644
--- a/themes/grav/templates/pages.html.twig
+++ b/themes/grav/templates/pages.html.twig
@@ -5,6 +5,8 @@
 {% endmacro %}
 
 {% macro loop(page, depth, twig_vars) %}
+    {% import _self as self %}
+
     {% set config = twig_vars['config'] %}
     {% set separator = config.system.param_sep %}
     {% set display_field = config.plugins.admin.pages_list_display_field %}
@@ -74,7 +76,7 @@
             </div>
             {% if p.children().count > 0 %}
                 <ul class="depth-{{ depth + 1 }}" style="display:none;">
-                    {{ macro.loop(p, depth + 1, twig_vars) }}
+                    {{ self.loop(p, depth + 1, twig_vars) }}
                 </ul>
             {% endif %}
         </li>
diff --git a/themes/grav/templates/partials/media-list-wrapper__sidebar.html.twig b/themes/grav/templates/partials/media-list-wrapper__sidebar.html.twig
index 2369ba01..f31a5c07 100644
--- a/themes/grav/templates/partials/media-list-wrapper__sidebar.html.twig
+++ b/themes/grav/templates/partials/media-list-wrapper__sidebar.html.twig
@@ -1,4 +1,6 @@
 {% macro loop(page, depth, twig_vars) %}
+    {% import _self as self %}
+
     {% set separator = twig_vars['config'].system.param_sep %}
     {% set base_url = twig_vars['base_url_relative'] %}
     {% set base_url_simple = twig_vars['base_url_simple'] %}
@@ -29,7 +31,7 @@
             {% if p.children().count > 0 %}
 
                 <ul class="depth-{{ depth + 1 }}" style="display:none;">
-                    {{ macro.loop(p, depth + 1, twig_vars) }}
+                    {{ self.loop(p, depth + 1, twig_vars) }}
                 </ul>
             {% endif %}
         </li>