diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-20 14:41:53 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-05-20 14:41:53 +0000 |
| commit | 08a223c4d6979a02732edd0af892f36cb538499a (patch) | |
| tree | d85b0f1b07278aea3bddb6ccd528dce0494d210f | |
| parent | 7c6db75ac0bc489adb0e90c6bd85e7d33945ad0c (diff) | |
| download | forums-08a223c4d6979a02732edd0af892f36cb538499a.tar forums-08a223c4d6979a02732edd0af892f36cb538499a.tar.gz forums-08a223c4d6979a02732edd0af892f36cb538499a.tar.bz2 forums-08a223c4d6979a02732edd0af892f36cb538499a.tar.xz forums-08a223c4d6979a02732edd0af892f36cb538499a.zip | |
- 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
| -rw-r--r-- | phpBB/includes/functions_template.php | 4 |
1 files 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++) { |