Index: trunk/core/units/general/inp1_parser.php
===================================================================
diff -u -N -r1566 -r1848
--- trunk/core/units/general/inp1_parser.php	(.../inp1_parser.php)	(revision 1566)
+++ trunk/core/units/general/inp1_parser.php	(.../inp1_parser.php)	(revision 1848)
@@ -20,7 +20,7 @@
 			$t = $var_list['t'];
 			$this->Application->SetVar('t', $t);
 			$template_cache =& $this->Application->recallObject('TemplatesCache');
-			$template_body = $this->Application->Parser->Parse( $template_cache->GetTemplateBody($t), $t );
+			$template_body = $this->Application->Parser->Parse( $template_cache->GetTemplateBody($t), $t, 0 );
 		}
 		else {
 			$template_body = $objTemplate->ParseTemplateFromBuffer($tname, $template_body);
Index: trunk/core/kernel/parser/template_parser.php
===================================================================
diff -u -N -r1780 -r1848
--- trunk/core/kernel/parser/template_parser.php	(.../template_parser.php)	(revision 1780)
+++ trunk/core/kernel/parser/template_parser.php	(.../template_parser.php)	(revision 1848)
@@ -338,6 +338,10 @@
 		$this->Output = '';
 		$this->TagHolder = new MyTagHolder();
 		
+		$has_inp_tags = false;
+		
+		if ($this->GetParam('from_inportal')) $pre_parse = 0;
+		
 		if (defined('EXPERIMENTAL_PRE_PARSE') && $pre_parse) {
 			$template_cache =& $this->Application->recallObject('TemplatesCache');
 			$fname = $template_cache->GetRealFilename($this->TemplateName).'.php';
@@ -393,11 +397,12 @@
 			if ( strpos($this->Output, '<inp:') !== false) {
 				$inp1_parser =& $this->Application->recallObject('Inp1Parser');
 				$this->Output = $inp1_parser->Parse($name, $this->Output);
+				$has_inp_tags = true;
 			}
 		}
 		
 		
-		if (defined('EXPERIMENTAL_PRE_PARSE') && $pre_parse) {
+		if (defined('EXPERIMENTAL_PRE_PARSE') && $pre_parse && !$has_inp_tags) {
 //			$this->CompiledBuffer .= 'echo $o;'."\n";
 			$this->CompiledBuffer .= '?'.'>'."\n";
 			
Index: trunk/kernel/units/general/inp1_parser.php
===================================================================
diff -u -N -r1566 -r1848
--- trunk/kernel/units/general/inp1_parser.php	(.../inp1_parser.php)	(revision 1566)
+++ trunk/kernel/units/general/inp1_parser.php	(.../inp1_parser.php)	(revision 1848)
@@ -20,7 +20,7 @@
 			$t = $var_list['t'];
 			$this->Application->SetVar('t', $t);
 			$template_cache =& $this->Application->recallObject('TemplatesCache');
-			$template_body = $this->Application->Parser->Parse( $template_cache->GetTemplateBody($t), $t );
+			$template_body = $this->Application->Parser->Parse( $template_cache->GetTemplateBody($t), $t, 0 );
 		}
 		else {
 			$template_body = $objTemplate->ParseTemplateFromBuffer($tname, $template_body);