templating

rueduphp · Jun 8, 2017 · bdac7b1 · bdac7b1
1 parent da5cc5d
commit bdac7b1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/lib.php b/lib/lib.php
@@ -1587,6 +1587,12 @@ function vue($file, $args = [], $status = 200)
                 );
             }
 
+            $layoutContent = str_replace(
+                ['$this'],
+                ['$self'],
+                $layoutContent
+            );
+
             response(
                 codeEvaluation(
                     $layoutContent,

diff --git a/lib/router.php b/lib/router.php
@@ -481,7 +481,7 @@ public function handling($routes, $quit = true)
                     if ($this->uri) {
                         route($route);
 
-                        if ($middleware = $route->getMiddleware()) {
+                        if ($middleware = $this->uri->getMiddleware()) {
                             if (!is_array($middleware)) {
                                 $middleware = [$middleware];
                             }