10 files changed, 106 insertions, 0 deletions
diff --git a/phpBB/includes/template/twig/extension.php b/phpBB/includes/template/twig/extension.php
index 5ffc45e75a..c279726434 100644
--- a/phpBB/includes/template/twig/extension.php
+++ b/phpBB/includes/template/twig/extension.php
@@ -57,6 +57,7 @@ class phpbb_template_twig_extension extends Twig_Extension
 			new phpbb_template_twig_tokenparser_define,
 			new phpbb_template_twig_tokenparser_include,
 			new phpbb_template_twig_tokenparser_includejs,
+			new phpbb_template_twig_tokenparser_includecss,
 			new phpbb_template_twig_tokenparser_event,
 			new phpbb_template_twig_tokenparser_includephp,
 			new phpbb_template_twig_tokenparser_php,
diff --git a/phpBB/includes/template/twig/lexer.php b/phpBB/includes/template/twig/lexer.php
index d0a84a8b7f..46412ad048 100644
--- a/phpBB/includes/template/twig/lexer.php
+++ b/phpBB/includes/template/twig/lexer.php
@@ -35,6 +35,7 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 			'INCLUDE',
 			'INCLUDEPHP',
 			'INCLUDEJS',
+			'INCLUDECSS',
 			'PHP',
 			'ENDPHP',
 			'EVENT',
@@ -78,6 +79,7 @@ class phpbb_template_twig_lexer extends Twig_Lexer
 			'INCLUDE',
 			'INCLUDEPHP',
 			'INCLUDEJS',
+			'INCLUDECSS',
 		), $code);
 
 		// Fix our BEGIN statements
diff --git a/phpBB/includes/template/twig/node/includecss.php b/phpBB/includes/template/twig/node/includecss.php
new file mode 100644
index 0000000000..01fda44aad
--- /dev/null
+++ b/phpBB/includes/template/twig/node/includecss.php
@@ -0,0 +1,30 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_node_includecss extends phpbb_template_twig_node_includeasset
+{
+	public function get_definition_name()
+	{
+		return 'STYLESHEETS';
+	}
+
+	/**
+	 * Compiles the node to PHP.
+	 *
+	 * @param Twig_Compiler A Twig_Compiler instance
+	 */
+	public function append_asset(Twig_Compiler $compiler)
+	{
+		$compiler
+			->raw("<link href=\"' . ")
+			->raw("\$asset_file . '\"")
+			->raw(' rel="stylesheet" type="text/css" media="screen, projection" />')
+		;
+	}
+}
diff --git a/phpBB/includes/template/twig/tokenparser/includecss.php b/phpBB/includes/template/twig/tokenparser/includecss.php
new file mode 100644
index 0000000000..6c24dda647
--- /dev/null
+++ b/phpBB/includes/template/twig/tokenparser/includecss.php
@@ -0,0 +1,38 @@
+<?php
+/**
+*
+* @package phpBB3
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+class phpbb_template_twig_tokenparser_includecss extends Twig_TokenParser
+{
+	/**
+	 * Parses a token and returns a node.
+	 *
+	 * @param Twig_Token $token A Twig_Token instance
+	 *
+	 * @return Twig_NodeInterface A Twig_NodeInterface instance
+	 */
+	public function parse(Twig_Token $token)
+	{
+		$expr = $this->parser->getExpressionParser()->parseExpression();
+
+		$stream = $this->parser->getStream();
+		$stream->expect(Twig_Token::BLOCK_END_TYPE);
+
+		return new phpbb_template_twig_node_includecss($expr, $this->parser->getEnvironment(), $token->getLine(), $this->getTag());
+	}
+
+	/**
+	 * Gets the tag name associated with this token parser.
+	 *
+	 * @return string The tag name
+	 */
+	public function getTag()
+	{
+		return 'INCLUDECSS';
+	}
+}
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 3c98edec79..25094bbf5d 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -76,6 +76,8 @@
 
 <!-- EVENT overall_header_head_append -->
 
+{$STYLESHEETS}
+
 </head>
 <body id="phpbb" class="section-{SCRIPT_NAME} {S_CONTENT_DIRECTION}">
 
diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 0317d6e45c..bc2307154b 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -132,6 +132,8 @@ function marklist(id, name, state)
 
 <!-- EVENT overall_header_head_append -->
 
+{$STYLESHEETS}
+
 </head>
 <body class="{S_CONTENT_DIRECTION}">
 
diff --git a/tests/template/parent_templates/parent_only.css b/tests/template/parent_templates/parent_only.css
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/template/parent_templates/parent_only.css
diff --git a/tests/template/template_includecss_test.php b/tests/template/template_includecss_test.php
new file mode 100644
index 0000000000..f8999ad1a9
--- /dev/null
+++ b/tests/template/template_includecss_test.php
@@ -0,0 +1,28 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+require_once dirname(__FILE__) . '/template_test_case_with_tree.php';
+
+class phpbb_template_template_includecss_test extends phpbb_template_template_test_case_with_tree
+{
+	public function test_includecss_compilation()
+	{
+		// Reset the engine state
+		$this->setup_engine(array('assets_version' => 1));
+
+		// Prepare correct result
+		$scripts = array(
+			'<link href="' . $this->test_path . '/templates/child_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen, projection" />',
+			'<link href="' . $this->test_path . '/parent_templates/parent_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen, projection" />',
+		);
+
+		// Run test
+		$this->run_template('includecss.html', array(), array(), array(), implode('', $scripts));
+	}
+}
diff --git a/tests/template/templates/child_only.css b/tests/template/templates/child_only.css
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/template/templates/child_only.css
diff --git a/tests/template/templates/includecss.html b/tests/template/templates/includecss.html
new file mode 100644
index 0000000000..39de61dfca
--- /dev/null
+++ b/tests/template/templates/includecss.html
@@ -0,0 +1,3 @@
+<!-- INCLUDECSS child_only.css -->
+<!-- INCLUDECSS parent_only.css -->
+{$STYLESHEETS}
+\ No newline at end of file