From e4a9fe29d6cd5c6704ba18938734586eeb8e5e53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Gawe=C5=82?= <dmgawel@users.noreply.github.com>
Date: Thu, 19 Oct 2017 12:59:24 +0200
Subject: [PATCH] Update template hierarchy

All sage/filter_templates/paths have now higher priority than stand-alone template files. Fixes #1979
---
 app/helpers.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/helpers.php b/app/helpers.php
index 71f4e24b..d5d54460 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -109,10 +109,12 @@ function filter_templates($templates)
                     return [
                         "{$path}/{$template}.blade.php",
                         "{$path}/{$template}.php",
-                        "{$template}.blade.php",
-                        "{$template}.php",
                     ];
-                });
+                })
+                ->concat([
+                    "{$template}.blade.php",
+                    "{$template}.php",
+                ]);
         })
         ->filter()
         ->unique()