Skip to content

D
Dwoo
Commit 71c975d4 by Jordi Boggiano
Options

Fixing regression in the last commit

parent 43cee22e
Showing with 23 additions and 1 deletion
lib/plugins/builtin/functions/extends.php
...@@ -74,7 +74,7 @@ class Dwoo_Plugin_extends extends Dwoo_Plugin implements Dwoo_ICompilable ...@@ -74,7 +74,7 @@ class Dwoo_Plugin_extends extends Dwoo_Plugin implements Dwoo_ICompilable
} }
$inheritanceTree[] = $newParent; $inheritanceTree[] = $newParent;
if (preg_match('/^'.self::$l.'extends(?:\(?\s*|\s+)(?:file=)?\s*((["\']).+?\2|\S+?)\s*\)\s*?'.self::$r.'/i', $parent->getSource(), $match)) { if (preg_match('/^'.self::$l.'extends(?:\(?\s*|\s+)(?:file=)?\s*((["\']).+?\2|\S+?)\s*\)?\s*?'.self::$r.'/i', $parent->getSource(), $match)) {
$curPath = dirname($identifier) . DIRECTORY_SEPARATOR; $curPath = dirname($identifier) . DIRECTORY_SEPARATOR;
if (isset($match[2]) && $match[2] == '"') { if (isset($match[2]) && $match[2] == '"') {
$file = '"'.str_replace('"', '\\"', substr($match[1], 1, -1)).'"'; $file = '"'.str_replace('"', '\\"', substr($match[1], 1, -1)).'"';
......
tests/FuncTests.php
...@@ -242,6 +242,14 @@ class FuncTests extends PHPUnit_Framework_TestCase ...@@ -242,6 +242,14 @@ class FuncTests extends PHPUnit_Framework_TestCase
$this->assertEquals("<html>ThirdLevel</html>", $this->dwoo->get($tpl, array(), $this->compiler)); $this->assertEquals("<html>ThirdLevel</html>", $this->dwoo->get($tpl, array(), $this->compiler));
} }
public function testExtendsWithBraces()
{
$tpl = new Dwoo_Template_File(TEST_DIRECTORY.'/resources/extends_braces/sub/test.html');
$tpl->forceCompilation();
$this->assertEquals("<html>ThirdLevel</html>", $this->dwoo->get($tpl, array(), $this->compiler));
}
public function testExtendsVariation2() public function testExtendsVariation2()
{ {
$tpl = new Dwoo_Template_File(TEST_DIRECTORY.'/resources/extends/root.html'); $tpl = new Dwoo_Template_File(TEST_DIRECTORY.'/resources/extends/root.html');
......
tests/resources/extends_braces/home.html 0 → 100755
{extends('root.html')}
{block "content"}
SecondLevel
{/block}
\ No newline at end of file
tests/resources/extends_braces/root.html 0 → 100755
<html>{block "content"}Root{/block}</html>
\ No newline at end of file
tests/resources/extends_braces/sub/test.html 0 → 100755
{extends("../home.html")}
{block "content"}
ThirdLevel
{/block}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment