Index: branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php
===================================================================
diff -u -r5726 -r5731
--- branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php	(.../application.php)	(revision 5726)
+++ branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php	(.../application.php)	(revision 5731)
@@ -644,7 +644,6 @@
 		if (!$this->RequestProcessed) $this->ProcessRequest();
 
 		$this->InitParser();
-		$this->TemplatesCache =& $this->recallObject('TemplatesCache');
 		$t = $this->GetVar('t');
 
 		if ($this->isModuleEnabled('In-CMS')) {
@@ -670,7 +669,10 @@
 
 	function InitParser()
 	{
-		if( !is_object($this->Parser) ) $this->Parser =& $this->recallObject('TemplateParser');
+		if( !is_object($this->Parser) ) {
+			$this->Parser =& $this->recallObject('TemplateParser');
+			$this->TemplatesCache =& $this->recallObject('TemplatesCache');
+		}
 	}
 
 	/**
Index: branches/unlabeled/unlabeled-1.61.2/core/kernel/processors/main_processor.php
===================================================================
diff -u -r5726 -r5731
--- branches/unlabeled/unlabeled-1.61.2/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 5726)
+++ branches/unlabeled/unlabeled-1.61.2/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 5731)
@@ -519,7 +519,7 @@
 		$t = $this->SelectParam($params, 't,template,block,name');
 		$t = eregi_replace("\.tpl$", '', $t);
 
-		$res = $BlockParser->ParseTemplate(	$t, 1, $params );
+		$res = $BlockParser->ParseTemplate(	$t, 1, $params, isset($params['is_silent']) ? 1 : 0 );
 
 		if ( !$BlockParser->DataExists && (isset($params['data_exists']) || isset($params['block_no_data'])) ) {
 			if ($block_no_data = getArrayValue($params, 'block_no_data')) {
Index: branches/unlabeled/unlabeled-1.26.2/core/kernel/db/dbitem.php
===================================================================
diff -u -r5439 -r5731
--- branches/unlabeled/unlabeled-1.26.2/core/kernel/db/dbitem.php	(.../dbitem.php)	(revision 5439)
+++ branches/unlabeled/unlabeled-1.26.2/core/kernel/db/dbitem.php	(.../dbitem.php)	(revision 5731)
@@ -229,7 +229,12 @@
 		$ret = '';
 		foreach($keys_hash as $field => $value)
 		{
-			$ret .= '(`'.$this->TableName.'`.'.$field.' = '.$this->Conn->qstr($value).') AND ';
+			if (!preg_match('/\./', $field)) {
+				$ret .= '(`'.$this->TableName.'`.'.$field.' = '.$this->Conn->qstr($value).') AND ';
+			}
+			else {
+				$ret .= '('.$field.' = '.$this->Conn->qstr($value).') AND ';
+			}
 		}
 
 		return preg_replace('/(.*) AND $/', '\\1', $ret);
Index: branches/unlabeled/unlabeled-1.24.2/core/kernel/parser/template_parser.php
===================================================================
diff -u -r5726 -r5731
--- branches/unlabeled/unlabeled-1.24.2/core/kernel/parser/template_parser.php	(.../template_parser.php)	(revision 5726)
+++ branches/unlabeled/unlabeled-1.24.2/core/kernel/parser/template_parser.php	(.../template_parser.php)	(revision 5731)
@@ -354,7 +354,7 @@
 		}
 	}
 
-	function ParseTemplate($name, $pre_parse = 1, $params=array())
+	function ParseTemplate($name, $pre_parse = 1, $params=array(), $silent=0)
 	{
 		$this->FromPreParseCache = false;
 		if ($this->GetParam('from_inportal')) $pre_parse = 0;
@@ -384,7 +384,7 @@
 
 				$this->CompiledBuffer .= '$o = \'\';'."\n";
 
-				$output = $this->NewParse($this->Application->TemplatesCache->GetTemplateBody($name), $name);
+				$output = $this->NewParse($this->Application->TemplatesCache->GetTemplateBody($name, $silent), $name);
 
 				$this->CompiledBuffer .= '?'.'>'."\n";