Index: branches/RC/core/kernel/processors/main_processor.php =================================================================== diff -u -N -r11410 -r11525 --- branches/RC/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 11410) +++ branches/RC/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 11525) @@ -653,7 +653,10 @@ $ret = ''; $block_params = array_merge($params, Array('is_silent' => 2)); // don't make fatal errors in case if template is missing $current_template = $this->Application->GetVar('t'); + + $replace_main = isset($params['replace_m']) && $params['replace_m']; $skip_prefixes = isset($params['skip_prefixes']) ? explode(',', $params['skip_prefixes']) : Array(); + foreach ($this->Application->ModuleInfo as $module_name => $module_data) { $module_key = mb_strtolower($module_name); @@ -671,14 +674,24 @@ } $block_params['t'] = $module_prefix.$this->SelectParam($params, $module_key.'_template,'.$module_key.'_t,template,t'); - if ($block_params['t'] == $current_template || in_array($module_data['Var'], $skip_prefixes)) continue; + $check_prefix = $module_data['Var']; + + if ($check_prefix == 'adm' && $replace_main) { + $check_prefix = 'c'; + } + + if ($block_params['t'] == $current_template || in_array($check_prefix, $skip_prefixes)) { + continue; + } + $no_data = $this->SelectParam($params, $module_key.'_block_no_data,block_no_data'); if ($no_data) { $block_params['block_no_data'] = $module_prefix.'/'.$no_data; } $ret .= $this->MyInclude($block_params); } + return $ret; }