Fixing optional layout functionality

EMRL · Aug 17, 2016 · 28711e5 · 28711e5
1 parent 804e56c
commit 28711e5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/src/Template/Layout.php b/src/Template/Layout.php
@@ -32,19 +32,23 @@ public function __construct($themePath)
     {
         $this->themePath = $themePath;
 
-        add_filter('template_include', function ($template) {
-            $this->template = $template;
+        add_action('after_setup_theme', function () {
+            if (apply_filters('fire/use-layout', true)) {
+                add_filter('template_include', function ($template) {
+                    $this->template = $template;
 
-            $name = str_replace($this->themePath, '', $template);
+                    $name = str_replace($this->themePath, '', $template);
 
-            $layouts = ['layout.php'];
+                    $layouts = ['layout.php'];
 
-            if (isset($this->layouts[$name])) {
-                array_unshift($layouts, $this->layouts[$name]);
-            }
+                    if (isset($this->layouts[$name])) {
+                        array_unshift($layouts, $this->layouts[$name]);
+                    }
 
-            return locate_template($layouts);
-        }, 1000);
+                    return locate_template($layouts);
+                }, 1000);
+            }
+        });
     }
 
     /**

diff --git a/src/Template/services.php b/src/Template/services.php
@@ -7,14 +7,10 @@
         return new FileTemplateFinder($fire['filesystem'], [$fire['path.fire'].'templates']);
     });
 
+    $fire->instance('template.layout', new Layout($fire['path.theme']));
+
     $fire->singleton('template', function ($fire) {
         return new Template($fire['template.finder']);
     });
 });
 
-add_action('fire/ignite', function ($fire) {
-    if (apply_filters('fire/use-layout', true)) {
-        $fire->instance('template.layout', new Layout($fire['path.theme']));
-    }
-});
-