Merge pull request #1941 from kaisermann/fix-template-controller

Ensure templates filenames without path and extension.
roots · Aug 17, 2017 · 499f809 · 499f809
2 parents e00eaf7 + 33b981c
commit 499f809
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/app/helpers.php b/app/helpers.php
@@ -85,12 +85,25 @@ function asset_path($asset)
  */
 function filter_templates($templates)
 {
+    $paths = apply_filters('sage/filter_templates/paths', [
+        'views',
+        'resources/views'
+    ]);
+    $paths_pattern = "#^(" . implode('|', $paths) . ")/#";
+
     return collect($templates)
-        ->map(function ($template) {
-            return preg_replace('#\.(blade\.)?php$#', '', ltrim($template));
+        ->map(function ($template) use ($paths_pattern) {
+            /** Remove .blade.php/.blade/.php from template names */
+            $template = preg_replace('#\.(blade\.?)?(php)?$#', '', ltrim($template));
+
+            /** Remove partial $paths from the beginning of template names */
+            if (strpos($template, '/')) {
+                $template = preg_replace($paths_pattern, '', $template);
+            }
+
+            return $template;
         })
-        ->flatMap(function ($template) {
-            $paths = apply_filters('sage/filter_templates/paths', ['views', 'resources/views']);
+        ->flatMap(function ($template) use ($paths) {
             return collect($paths)
                 ->flatMap(function ($path) use ($template) {
                     return [