diff --git a/phpBB/includes/template.php b/phpBB/includes/template.php
index 317bf8c5b6..81e674d923 100644
--- a/phpBB/includes/template.php
+++ b/phpBB/includes/template.php
@@ -440,9 +440,10 @@ class template
 		$includephp_blocks = $matches[1];
 		$code = preg_replace('#<!-- INCLUDEPHP ([a-zA-Z0-9\_\-\+\.]+?) -->#', '<!-- INCLUDEPHP -->', $code);
 
-		preg_match_all('#<!-- (.*?) (.*?)?[ ]?-->#s', $code, $blocks);
-		$text_blocks = preg_split('#<!-- (.*?) (.*?)?[ ]?-->#s', $code);
-		for($i = 0; $i < count($text_blocks); $i++)
+		preg_match_all('#<!-- (.*?) (.*?)?[ ]?-->#', $code, $blocks);
+		$text_blocks = preg_split('#<!-- (.*?) (.*?)?[ ]?-->#', $code);
+		
+		for ($i = 0, $j = sizeof($text_blocks); $i < $j; $i++)
 		{
 			$this->compile_var_tags($text_blocks[$i]);
 		}