Index: branches/5.0.x/core/kernel/nparser/nparser.php
===================================================================
diff -u -r12808 -r12956
--- branches/5.0.x/core/kernel/nparser/nparser.php	(.../nparser.php)	(revision 12808)
+++ branches/5.0.x/core/kernel/nparser/nparser.php	(.../nparser.php)	(revision 12956)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: nparser.php 12808 2009-10-27 17:03:35Z alex $
+* @version	$Id: nparser.php 12956 2009-12-20 12:57:26Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -27,6 +27,13 @@
 	var $Buffers = array();
 	var $InsideComment = false;
 
+	/**
+	 * Parse tags inside HTML comments
+	 *
+	 * @var bool
+	 */
+	var $SkipComments = true;
+
 	var $Params = array();
 	var $ParamsStack = array();
 	var $ParamsLevel = 0;
@@ -131,7 +138,7 @@
 
 			// the idea is to count number of comment openings and closings before current tag
 			// if the numbers do not match we inverse the status of InsideComment
-			if (substr_count($tag_data[1][0], '<!--') != substr_count($tag_data[1][0], '-->')) {
+			if ($this->SkipComments && (substr_count($tag_data[1][0], '<!--') != substr_count($tag_data[1][0], '-->'))) {
 				$this->InsideComment = !$this->InsideComment;
 			}
 
Index: branches/5.0.x/core/kernel/nparser/ntags.php
===================================================================
diff -u -r12734 -r12956
--- branches/5.0.x/core/kernel/nparser/ntags.php	(.../ntags.php)	(revision 12734)
+++ branches/5.0.x/core/kernel/nparser/ntags.php	(.../ntags.php)	(revision 12956)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: ntags.php 12734 2009-10-20 19:28:11Z alex $
+* @version	$Id: ntags.php 12956 2009-12-20 12:57:26Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -99,14 +99,18 @@
 
 class _Tag_Comment extends _BlockTag {
 
-	function PassThrough(&$tag)
+	function Open($tag)
 	{
-		$tag['processed'] = true;
+		$this->Parser->SkipComments = false;
+
+		return '';
 	}
 
 	function Close($tag)
 	{
-		return '';
+		$this->Parser->SkipComments = true;
+
+		return $this->Parser->Buffers[$this->Parser->Level];
 	}
 }