* Include allows paths going in upper levels now such as : "../foo.html"

CHANGELOG

@@ -19,6 +19,7 @@
    => http://forum.dwoo.org/viewtopic.php?id=50
 * Compiler now allows the use of the right delimiter inside strings (e.g. {"}"})
 * Fixed a bug preventing if blocks containing a {elseif} followed by {else}
+* Include allows paths going in upper levels now such as : "../foo.html"
 
 [2008-06-28] 0.9.2
 ! BC Break: Renamed the {strip} modifier/function to {whitespace}, this does

lib/plugins/builtin/functions/include.php

@@ -59,6 +59,10 @@ function Dwoo_Plugin_include(Dwoo $dwoo, $file, $cache_time = null, $cache_id =
 		}
 	}
 
+	if ($resource === 'file' && strpos($identifier, '..') !== false) {
+		$identifier = realpath(dirname($dwoo->getTemplate()->getResourceIdentifier()) . DIRECTORY_SEPARATOR . $identifier);
+	}
+
 	try {
 		$include = $dwoo->templateFactory($resource, $identifier, $cache_time, $cache_id, $compile_id);
 	} catch (Dwoo_Exception $e) {

tests/FuncTests.php

@@ -243,6 +243,14 @@ class FuncTests extends PHPUnit_Framework_TestCase
 		$this->assertEquals("34", $this->dwoo->get($tpl, array(), $this->compiler));
 	}
 
+	public function testIncludeParent()
+	{
+		$tpl = new Dwoo_Template_File(TEST_DIRECTORY.'/resources/subfolder/inctest.html');
+		$tpl->forceCompilation();
+
+		$this->assertEquals("43", $this->dwoo->get($tpl, array(), $this->compiler));
+	}
+
 	public function testIndent()
 	{
 		$tpl = new Dwoo_Template_String('{indent $foo 6 "-"}');

tests/resources/subfolder/inctest.html

+{include file="../test.html" foo=4 bar=3}
\ No newline at end of file