Index: branches/5.1.x/core/kernel/nparser/ntags.php
===================================================================
diff -u -N -r12657 -r13086
--- branches/5.1.x/core/kernel/nparser/ntags.php	(.../ntags.php)	(revision 12657)
+++ branches/5.1.x/core/kernel/nparser/ntags.php	(.../ntags.php)	(revision 13086)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: ntags.php 12657 2009-10-04 20:07:31Z alex $
+* @version	$Id: ntags.php 13086 2010-01-12 19:47:40Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -9,7 +9,7 @@
 * the GNU General Public License, and as distributed it includes
 * or is derivative of works licensed under the GNU General Public License
 * or other free or open source software licenses.
-* See http://www.in-portal.net/license/ for copyright notices and details.
+* See http://www.in-portal.org/license for copyright notices and details.
 */
 
 defined('FULL_PATH') or die('restricted access!');
@@ -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];
 	}
 }
 
@@ -400,8 +404,17 @@
 		$code[] = '$_tag_params = ' . $to_pass . ';';
 		$code[] = "\${$tag['NP']['name']} = \$_p_->PostProcess(\${$tag['NP']['name']}, \$_p_->PreparePostProcess(\$_tag_params));";
 		$code[] = "}";
-
-		if (array_key_exists('plus', $tag['NP'])) {
+		
+		if (array_key_exists('result_to_var', $tag['NP']) && $tag['NP']['result_to_var']) {
+			$code[] = "\$params['{$tag['NP']['result_to_var']}'] = \$_parser->GetParam('{$tag['NP']['result_to_var']}');";
+			
+			if (array_key_exists('plus', $tag['NP'])) {
+				$code[] = "\$params['{$tag['NP']['result_to_var']}'] += {$tag['NP']['plus']};";
+			}
+		
+			$code[] = "\${$tag['NP']['result_to_var']} = \$params['{$tag['NP']['result_to_var']}'];";
+		}
+		elseif (array_key_exists('plus', $tag['NP'])) {
 			$code[] = "\${$tag['NP']['name']} += {$tag['NP']['plus']};";
 		}