implement including method resolving #INCLUDE tag

2013-02-19 13:07:15 +01:00
parent 99b428fb5c
commit f9f2b71f22
2 changed files with 4 additions and 4 deletions
--- a/core/lib/Thelia/Core/Template/Parser.php
+++ b/core/lib/Thelia/Core/Template/Parser.php
@@ -131,8 +131,6 @@ class Parser implements ParserInterface
    {
       $this->loadParser();
       
-       echo \Thelia\Model\ConfigQuery::read("alfred", "dupont");
-       
       return $this->content;
    }

@@ -176,7 +174,7 @@ class Parser implements ParserInterface
        
        $this->tpex->init($this->container->get("request"), $this->container->get("dispatcher"), $content, THELIA_TEMPLATE_DIR . rtrim($this->template, "/") . "/");
        $this->tpex->setLogger(Tlog::getInstance());
-        $this->tpex->execute();
+        $this->setContent($this->tpex->execute());
    }
    
    protected function openFile(Request $request)
--- a/templates/default/index.html
+++ b/templates/default/index.html
@@ -9,6 +9,8 @@ and open the template in the editor.
        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    </head>
    <body>
-        <div>TODO write content</div>
+        <div>TODO write content
+        #INCLUDE "include1.html"
+        </div>
    </body>
 </html>