Index: branches/unlabeled/unlabeled-1.61.2/core/kernel/processors/main_processor.php =================================================================== diff -u -r5715 -r5726 --- branches/unlabeled/unlabeled-1.61.2/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 5715) +++ branches/unlabeled/unlabeled-1.61.2/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 5726) @@ -512,21 +512,19 @@ function MyInclude($params) { $BlockParser =& $this->Application->makeClass('TemplateParser'); - $BlockParser->SetParams($params); +// $BlockParser->SetParams($params); $parser =& $this->Application->Parser; $this->Application->Parser =& $BlockParser; $t = $this->SelectParam($params, 't,template,block,name'); $t = eregi_replace("\.tpl$", '', $t); - $templates_cache =& $this->Application->recallObject('TemplatesCache'); - $res = $BlockParser->Parse( $templates_cache->GetTemplateBody($t, getArrayValue($params, 'is_silent')), $t ); + $res = $BlockParser->ParseTemplate( $t, 1, $params ); - if ( !$BlockParser->DataExists && (isset($params['data_exists']) || isset($params['block_no_data'])) ) { if ($block_no_data = getArrayValue($params, 'block_no_data')) { $res = $BlockParser->Parse( - $templates_cache->GetTemplateBody($block_no_data, getArrayValue($params, 'is_silent') ), + $this->Application->TemplatesCache->GetTemplateBody($block_no_data, getArrayValue($params, 'is_silent') ), $t ); } @@ -538,6 +536,7 @@ $this->Application->Parser->DataExists = $this->Application->Parser->DataExists || $BlockParser->DataExists; return $res; } + function ModuleInclude($params) { $ret = ''; @@ -859,7 +858,7 @@ $lang =& $this->Application->recallObject('lang.current'); header('Content-type: text/xml; charset='.$lang->GetDBField('Charset')); } - + function RootCategoryName($params) { $root_phrase = $this->Application->ConfigValue('Root_Name');