Update

harrydeluxe · May 14, 2012 · db1c555 · db1c555
1 parent e388ba1
commit db1c555
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,5 @@
 
+ * Allow Templatenames with Fileextension
  * Extends Tag supports now multiple inheritance
  * Clean up code, change all variables and methods to camelCase
 

diff --git a/example/block.php b/example/block.php
@@ -1,6 +1,6 @@
 <?php
-define('LIQUID_INCLUDE_SUFFIX', 'tpl');
-define('LIQUID_INCLUDE_PREFIX', '');
+
+define('LIQUID_INCLUDE_ALLOW_EXT', true);
 
 require_once('../Liquid.class.php');
 
@@ -23,6 +23,5 @@
 			'copyright' => '&copy; Copyright 2012 Harald Hanek - All rights reserved.'
 			)
 		);
-
-print $liquid->render($assigns);
-?>
+
+echo $liquid->render($assigns);
diff --git a/example/protected/templates/base.tpl b/example/protected/templates/base.tpl
@@ -2,7 +2,7 @@
 <!DOCTYPE HTML>
 <html>
     <head>
-        {% include 'header' %}
+        {% include 'header.tpl' %}
     </head>
     <body>
 		<div id="content">{% block content %}{% endblock %}</div>	

diff --git a/example/protected/templates/blocks/child.tpl b/example/protected/templates/blocks/child.tpl
@@ -0,0 +1,6 @@
+{% comment %} This is the child template. {% endcomment %}
+{% extends "base.tpl" %}
+
+{% block footer %}
+	{{ document.copyright }}
+{% endblock %}
diff --git a/example/protected/templates/child.tpl b/example/protected/templates/child.tpl
@@ -1,11 +1,7 @@
 {% comment %} This is the child template. {% endcomment %}
-{% extends "base" %}
+{% extends "blocks/child.tpl" %}
 
 {% block content %}
 	<h2>Entry one</h2>
     <p>This is my first entry.</p>
-{% endblock %}
-
-{% block footer %}
-	{{ document.copyright }}
 {% endblock %}