Index: branches/5.0.x/core/kernel/nparser/nparser.php
===================================================================
diff -u -N -r12734 -r12808
--- branches/5.0.x/core/kernel/nparser/nparser.php	(.../nparser.php)	(revision 12734)
+++ branches/5.0.x/core/kernel/nparser/nparser.php	(.../nparser.php)	(revision 12808)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: nparser.php 12734 2009-10-20 19:28:11Z alex $
+* @version	$Id: nparser.php 12808 2009-10-27 17:03:35Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -50,14 +50,14 @@
 
 	var $CachePointers = array();
 	var $Cachable = array();
-	
+
 	/**
 	 * Parser parameter names, that are created via m_Capture tag are listed here
-	 * 
+	 *
 	 * @var Array
 	 */
 	var $Captures = array();
-	
+
 	/**
 	 * Phrases, used on "Edit" buttons, that parser adds during block decoration
 	 *
@@ -69,10 +69,9 @@
 	{
 		parent::kBase();
 
-		if (EDITING_MODE == EDITING_MODE_DESIGN) {
+		if (defined('EDITING_MODE') && (EDITING_MODE == EDITING_MODE_DESIGN)) {
 			$this->_btnPhrases['design'] = $this->Application->Phrase('la_btn_EditDesign', false);
 			$this->_btnPhrases['block'] = $this->Application->Phrase('la_btn_EditBlock', false);
-
 		}
 	}
 
@@ -300,7 +299,7 @@
 	{
 		$code = '';
 		$to_pass = $this->CompileParamsArray($tag['NP']);
-		
+
 		if ($tag['prefix'] == '__auto__') {
 			$prefix = $this->GetParam('PrefixSpecial');
 			$code .= '$_p_ =& $_parser->GetProcessor($PrefixSpecial);'."\n";
@@ -311,20 +310,20 @@
 			$code .= '$_p_ =& $_parser->GetProcessor("'.$tag['prefix'].'");'."\n";
 			$code .= 'echo $_p_->ProcessParsedTag(\''.$tag['name'].'\', '.$to_pass.', "'.$tag['prefix'].'", \''.$tag['file'].'\', '.$tag['line'].');'."\n";
 		}
-		
+
 		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']}');\n";
 			$code .= "\${$tag['NP']['result_to_var']} = \$params['{$tag['NP']['result_to_var']}'];\n";
 		}
-		
+
 		if ($prefix && strpos($prefix, '$') === false) {
 			$p =& $this->GetProcessor($prefix);
 			if (!is_object($p) || !$p->CheckTag($tag['name'], $tag['prefix'])) {
 				$this->Application->handleError(E_USER_ERROR, 'Unknown tag: '.$this->TagInfo($tag).' <b> - incorrect tag name or prefix </b>', $tag['file'], $tag['line']);
 				return false;
 			}
 		}
-		
+
 		return $code;
 	}
 
@@ -501,12 +500,12 @@
 		$this->PopParams();
 
 		if (array_key_exists('result_to_var', $flag_values) && $flag_values['result_to_var']) {
-			// when "result_to_var" used inside ParseBlock, then $$result_to_var parameter is set inside ParseBlock, 
-			// but not outside it as expected and got lost at all after PopParams is called, so make it work by 
+			// when "result_to_var" used inside ParseBlock, then $$result_to_var parameter is set inside ParseBlock,
+			// but not outside it as expected and got lost at all after PopParams is called, so make it work by
 			// setting it's value on current parameter deep level (from where ParseBlock was called)
 			$this->SetParam($flag_values['result_to_var'], $block_params[ $flag_values['result_to_var'] ]);
 		}
-		
+
 		$this->CheckNoData($ret, $params);
 
 		$this->DataExists = $data_exists_bak || $this->DataExists;