From d5896239068e1063970f398a12ffb5a0707fb286 Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Sat, 7 Jul 2012 22:43:52 +0100
Subject: [ticket/10970] Paths of the form {FOO}/a/{BAR}/b parsed correctly

A new method to handle this type of path was added and
compile_tag_include, compile_tag_include_php and
compile_tag_include_js were modified to use it appropriately.

Tests were added for these three macros also.

PHPBB3-10970
---
 tests/template/template_includejs_test.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'tests/template/template_includejs_test.php')

diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php
index a8f9a9037f..d8c7170e94 100644
--- a/tests/template/template_includejs_test.php
+++ b/tests/template/template_includejs_test.php
@@ -20,11 +20,13 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes
 		$scripts = array(
 			'<script src="' . $this->test_path . '/templates/parent_and_child.js?assets_version=1"></script>',
 			'<script src="' . $this->test_path . '/parent_templates/parent_only.js?assets_version=1"></script>',
-			'<script src="' . $this->test_path . '/templates/child_only.js?assets_version=1"></script>'
+			'<script src="' . $this->test_path . '/templates/child_only.js?assets_version=1"></script>',
+			'<script src="' . $this->test_path . '/templates/subdir/parent_only.js?assets_version=1"></script>',
+			'<script src="' . $this->test_path . '/templates/subdir/subsubdir/parent_only.js?assets_version=1"></script>',
 		);
 
 		// Run test
 		$cache_file = $this->template->cachepath . 'includejs.html.php';
-		$this->run_template('includejs.html', array('PARENT' => 'parent_only.js'), array(), array(), implode('', $scripts), $cache_file);
+		$this->run_template('includejs.html', array('PARENT' => 'parent_only.js', 'SUBDIR' => 'subdir'), array(), array(), implode('', $scripts), $cache_file);
 	}
 }
-- 
cgit v1.2.1


From d0cb5bb093d09a15f422f84e19d781a8260512a0 Mon Sep 17 00:00:00 2001
From: Fyorl <gaelreth@gmail.com>
Date: Sun, 8 Jul 2012 15:12:08 +0100
Subject: [ticket/10970] Added support for forms such as {FOO}bar.{EXT}

PHPBB3-10970
---
 tests/template/template_includejs_test.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests/template/template_includejs_test.php')

diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php
index d8c7170e94..22b020208b 100644
--- a/tests/template/template_includejs_test.php
+++ b/tests/template/template_includejs_test.php
@@ -23,10 +23,11 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes
 			'<script src="' . $this->test_path . '/templates/child_only.js?assets_version=1"></script>',
 			'<script src="' . $this->test_path . '/templates/subdir/parent_only.js?assets_version=1"></script>',
 			'<script src="' . $this->test_path . '/templates/subdir/subsubdir/parent_only.js?assets_version=1"></script>',
+			'<script src="' . $this->test_path . '/templates/subdir/parent_only.js?assets_version=1"></script>',
 		);
 
 		// Run test
 		$cache_file = $this->template->cachepath . 'includejs.html.php';
-		$this->run_template('includejs.html', array('PARENT' => 'parent_only.js', 'SUBDIR' => 'subdir'), array(), array(), implode('', $scripts), $cache_file);
+		$this->run_template('includejs.html', array('PARENT' => 'parent_only.js', 'SUBDIR' => 'subdir', 'EXT' => 'js'), array(), array(), implode('', $scripts), $cache_file);
 	}
 }
-- 
cgit v1.2.1