Index: trunk/core/kernel/processors/main_processor.php =================================================================== diff -u -N -r8397 -r8428 --- trunk/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 8397) +++ trunk/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 8428) @@ -43,7 +43,7 @@ else { $path = substr(THEMES_PATH, 1); $module = isset($params['module']) ? $params['module'] : 'core'; - + if (strtolower($module) == 'in-portal') { $module_folder = 'platform'; } @@ -141,7 +141,7 @@ { $params['pass'] = 'all,m'; $params['pass_category'] = 1; - + return $this->Application->HREF('', '', $params); } @@ -444,7 +444,7 @@ // m:phrase name="phrase_name" default="Tr-alala" updated="2004-01-29 12:49" if (array_key_exists('default', $params)) return $params['default']; //backward compatibility $translation = $this->Application->Phrase($this->SelectParam($params, 'label,name,title')); - + if (getArrayValue($params, 'escape')) { $translation = htmlspecialchars($translation, ENT_QUOTES); $translation = addslashes($translation); @@ -542,7 +542,7 @@ { $BlockParser =& $this->Application->makeClass('TemplateParser'); /* @var $BlockParser TemplateParser */ - + // $BlockParser->SetParams($params); $parser =& $this->Application->Parser; $this->Application->Parser =& $BlockParser; @@ -566,7 +566,7 @@ else { $res = $BlockParser->ParseTemplate($t, 1, $params, isset($params['is_silent']) ? 1 : 0 ); } - + if (!$BlockParser->DataExists && ((isset($params['data_exists']) && $params['data_exists']) || isset($params['block_no_data']))) { if ($block_no_data = getArrayValue($params, 'block_no_data')) { if (isset($this->Application->PreParsedBlocks[$block_no_data]) ) { @@ -585,12 +585,12 @@ $this->Application->Parser =& $parser; $this->Application->Parser->DataExists = $this->Application->Parser->DataExists || $BlockParser->DataExists; - + if (isset($params['return_params']) && $params['return_params']) { $new_params = array_merge($this->Application->Parser->Params, $BlockParser->ParamsStack[0]); $this->Application->Parser->SetParams($new_params, false); } - + return $res; } @@ -711,21 +711,21 @@ $block_params['return_params'] = 1; $block_params['strip_nl'] = 2; $block_content = $this->MyInclude($block_params); - + if (isset($params['data_exists']) && $params['data_exists'] && !$block_content) { return ''; } - + // prepare design $block_params = Array ( 'content' => $block_content, ); } - + $block_params['name'] = $params['design']; return $this->Application->ParseBlock($block_params, 1); } - + return $this->ParseBlock($params); } @@ -964,9 +964,8 @@ function SetDefaultCategory($params) { - $module_name = $params['module']; - $module =& $this->Application->recallObject('mod.'.$module_name); - $this->Application->SetVar('m_cat_id', $module->GetDBField('RootCat') ); + $category_id = $this->Application->findModule('Name', $params['module'], 'RootCat'); + $this->Application->SetVar('m_cat_id', $category_id); } function XMLTemplate($params)