From 08a223c4d6979a02732edd0af892f36cb538499a Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sat, 20 May 2006 14:41:53 +0000
Subject: [PATCH] - allow commenting out on one line: <!-- <!-- IF WHATEVER
 --><br /><b>{WHATEVER}:</b><!-- ENDIF --> --> bug #1869

(i hope i did not break something :o)


git-svn-id: file:///svn/phpbb/trunk@5946 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/functions_template.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/includes/functions_template.php b/phpBB/includes/functions_template.php
index c37f1292c4..336e86d24c 100644
--- a/phpBB/includes/functions_template.php
+++ b/phpBB/includes/functions_template.php
@@ -104,8 +104,8 @@ class template_compile
 		$includephp_blocks = $matches[1];
 		$code = preg_replace('#<!-- INCLUDEPHP ([a-zA-Z0-9\_\-\+\./]+?) -->#', '<!-- INCLUDEPHP -->', $code);
 
-		preg_match_all('#<!-- (.*?) (.*?)?[ ]?-->#', $code, $blocks);
-		$text_blocks = preg_split('#<!-- (.*?) (.*?)?[ ]?-->#', $code);
+		preg_match_all('#<!-- ([^<!--].*?) (.*?)?[ ]?-->#', $code, $blocks);
+		$text_blocks = preg_split('#<!-- ([^<!--].*?) (.*?)?[ ]?-->#', $code);
 		
 		for ($i = 0, $j = sizeof($text_blocks); $i < $j; $i++)
 		{