Index: core/kernel/db/cat_tag_processor.php =================================================================== --- core/kernel/db/cat_tag_processor.php (revision 13241) +++ core/kernel/db/cat_tag_processor.php (working copy) @@ -226,6 +226,7 @@ $params['grid_name'] .= 'ShowAll'; } + // use $pass_params to be able to pass 'tab_init' parameter from m_ModuleInclude tag return $this->Application->ParseBlock($params, 1); } Index: core/kernel/db/db_tag_processor.php =================================================================== --- core/kernel/db/db_tag_processor.php (revision 13243) +++ core/kernel/db/db_tag_processor.php (working copy) @@ -534,7 +534,7 @@ // record in this iteration is first in row, then open row $column_number = 1; $o.= $block_start_row_params['name'] ? - $this->Application->ParseBlock($block_start_row_params, 1) : + $this->Application->ParseBlock($block_start_row_params) : (!isset($params['no_table']) ? '' : ''); } else { @@ -548,19 +548,19 @@ $block_params['num'] = ($i+1); $this->PrepareListElementParams($list, $block_params); // new, no need to rewrite PrintList - $o.= $this->Application->ParseBlock($block_params, 1); + $o.= $this->Application->ParseBlock($block_params); array_push($displayed, $list->GetDBField($id_field)); if($direction == 'V' && $list->SelectedCount % $columns > 0 && $column_number == ($columns - 1) && ceil(($i + 1) / $columns) > $list->SelectedCount % ceil($list->SelectedCount / $columns)) { // if vertical output, then draw empty cells vertically, not horizontally - $o .= $block_empty_cell_params['name'] ? $this->Application->ParseBlock($block_empty_cell_params, 1) : ' '; + $o .= $block_empty_cell_params['name'] ? $this->Application->ParseBlock($block_empty_cell_params) : ' '; $i++; } if (($i + 1) % $columns == 0) { // record in next iteration is first in row too, then close this row $o.= $block_end_row_params['name'] ? - $this->Application->ParseBlock($block_end_row_params, 1) : + $this->Application->ParseBlock($block_end_row_params) : (!isset($params['no_table']) ? '' : ''); } @@ -571,11 +571,11 @@ // append empty cells in place of missing cells in last row while ($i % $columns != 0) { // until next cell will be in new row append empty cells - $o .= $block_empty_cell_params['name'] ? $this->Application->ParseBlock($block_empty_cell_params, 1) : ' '; + $o .= $block_empty_cell_params['name'] ? $this->Application->ParseBlock($block_empty_cell_params) : ' '; if (($i+1) % $columns == 0) { // record in next iteration is first in row too, then close this row - $o .= $block_end_row_params['name'] ? $this->Application->ParseBlock($block_end_row_params, 1) : ''; + $o .= $block_end_row_params['name'] ? $this->Application->ParseBlock($block_end_row_params) : ''; } $i++; } @@ -961,7 +961,7 @@ $block_params['key'] = $key; $block_params['option'] = $val; $block_params[$selected_param_name] = ( in_array($key, $value) ? ' '.$selected : ''); - $o .= $this->Application->ParseBlock($block_params, 1); + $o .= $this->Application->ParseBlock($block_params); } } else { @@ -970,7 +970,7 @@ $block_params['key'] = $key; $block_params['option'] = $val; $block_params[$selected_param_name] = (strlen($key) == strlen($value) && ($key == $value) ? ' '.$selected : ''); - $o .= $this->Application->ParseBlock($block_params, 1); + $o .= $this->Application->ParseBlock($block_params); } } return $o; @@ -1106,7 +1106,7 @@ $prev_block_params['page'] = max($current_page-$split, 1); $prev_block_params['name'] = $this->SelectParam($params, 'prev_page_split_render_as,prev_page_split_block'); if ($prev_block_params['name']){ - $o .= $this->Application->ParseBlock($prev_block_params, 1); + $o .= $this->Application->ParseBlock($prev_block_params); } } @@ -1115,13 +1115,13 @@ $prev_block_params['name'] = $this->SelectParam($params, 'prev_page_render_as,block_prev_page,prev_page_block'); if ($prev_block_params['name']) { $this->Application->SetVar($this->getPrefixSpecial().'_Page', $current_page-1); - $o .= $this->Application->ParseBlock($prev_block_params, 1); + $o .= $this->Application->ParseBlock($prev_block_params); } } else { if ( $no_prev_page_block = $this->SelectParam($params, 'no_prev_page_render_as,block_no_prev_page') ) { $block_params['name'] = $no_prev_page_block; - $o .= $this->Application->ParseBlock($block_params, 1); + $o .= $this->Application->ParseBlock($block_params); } } @@ -1138,12 +1138,12 @@ $block_params['name'] = $block; $block_params['page'] = $i; $this->Application->SetVar($this->getPrefixSpecial().'_Page', $i); - $o .= $this->Application->ParseBlock($block_params, 1); + $o .= $this->Application->ParseBlock($block_params); if ($this->SelectParam($params, 'separator_render_as,block_separator') && $i < $split_end) { - $o .= $this->Application->ParseBlock($separator_params, 1); + $o .= $this->Application->ParseBlock($separator_params); } } @@ -1153,20 +1153,20 @@ $next_block_params['name'] = $this->SelectParam($params, 'next_page_render_as,block_next_page,next_page_block'); if ($next_block_params['name']){ $this->Application->SetVar($this->getPrefixSpecial().'_Page', $current_page+1); - $o .= $this->Application->ParseBlock($next_block_params, 1); + $o .= $this->Application->ParseBlock($next_block_params); } if ($total_pages > $split){ $next_block_params['page']=min($current_page+$split, $total_pages); $next_block_params['name'] = $this->SelectParam($params, 'next_page_split_render_as,next_page_split_block'); if ($next_block_params['name']){ - $o .= $this->Application->ParseBlock($next_block_params, 1); + $o .= $this->Application->ParseBlock($next_block_params); } } } else { if ( $no_next_page_block = $this->SelectParam($params, 'no_next_page_render_as,block_no_next_page') ) { $block_params['name'] = $no_next_page_block; - $o .= $this->Application->ParseBlock($block_params, 1); + $o .= $this->Application->ParseBlock($block_params); } } @@ -1794,6 +1794,8 @@ default: break; } + + // use $pass_params to pass 'SourcePrefix' parameter from PrintList to CustomInputName tag return $this->Application->ParseBlock($params, 1); } @@ -2141,7 +2143,7 @@ if (array_key_exists('as_url', $params) && $params['as_url']) { $path = str_replace( FULL_PATH . '/', $this->Application->BaseURL(), $path); } - + return $path . $filename; } Index: core/kernel/processors/main_processor.php =================================================================== --- core/kernel/processors/main_processor.php (revision 13241) +++ core/kernel/processors/main_processor.php (working copy) @@ -685,7 +685,7 @@ $block_params['passed'] = $params['passed']; $block_params['prefix'] = 'm'; - $o.= $this->Application->ParseBlock($block_params, 1); + $o.= $this->Application->ParseBlock($block_params); } return $o; }*/ Index: core/units/categories/categories_tag_processor.php =================================================================== --- core/units/categories/categories_tag_processor.php (revision 13241) +++ core/units/categories/categories_tag_processor.php (working copy) @@ -655,7 +655,7 @@ $params['name'] = $params['render_as']; $params['skip_prefixes'] = implode(',', $skip_prefixes); - return $this->Application->ParseBlock($params, 1); + return $this->Application->ParseBlock($params); } /** @@ -1002,6 +1002,7 @@ $params['grid_name'] .= 'ShowAll'; } + // use $pass_params to be able to pass 'tab_init' parameter from m_ModuleInclude tag return $this->Application->ParseBlock($params, 1); } @@ -1596,7 +1597,7 @@ while (!$list->EOL()) { $block_params['path'] = $list->GetDBField('Path'); - $o .= $this->Application->ParseBlock($block_params, 1); + $o .= $this->Application->ParseBlock($block_params); $list->GoNext(); } Index: core/units/config_search/config_search_tag_processor.php =================================================================== --- core/units/config_search/config_search_tag_processor.php (revision 13241) +++ core/units/config_search/config_search_tag_processor.php (working copy) @@ -44,7 +44,7 @@ $this->Application->SetVar( $this->getPrefixSpecial().'_id', $list->GetDBField($id_field) ); // for edit/delete links using GET $block_params['show_heading'] = ($prev_heading != $list->GetDBField('ConfigHeader') ) ? 1 : 0; - $o.= $this->Application->ParseBlock($block_params, 1); + $o.= $this->Application->ParseBlock($block_params); $prev_heading = $list->GetDBField('ConfigHeader'); $list->GoNext(); } Index: core/units/configuration/configuration_tag_processor.php =================================================================== --- core/units/configuration/configuration_tag_processor.php (revision 13241) +++ core/units/configuration/configuration_tag_processor.php (working copy) @@ -75,7 +75,7 @@ } $list->SetDBField('DirectOptions', ''); - $o.= $this->Application->ParseBlock($block_params, 1); + $o.= $this->Application->ParseBlock($block_params); $prev_heading = $list->GetDBField('heading'); $list->GoNext(); } @@ -123,7 +123,7 @@ $block_params['module_item'] = $this->getModuleItemName(); $list->GoFirst(); - return $this->Application->ParseBlock($block_params, 1); + return $this->Application->ParseBlock($block_params); } Index: core/units/custom_fields/custom_fields_tag_processor.php =================================================================== --- core/units/custom_fields/custom_fields_tag_processor.php (revision 13241) +++ core/units/custom_fields/custom_fields_tag_processor.php (working copy) @@ -123,7 +123,7 @@ $list->SetDBField('DirectOptions', isset($options['options']) ? $options['options'] : false); } - $o.= $this->Application->ParseBlock($block_params, 1); + $o.= $this->Application->ParseBlock($block_params); $prev_heading = $list->GetDBField('Heading'); $list->GoNext(); $i++; Index: in-commerce/units/orders/orders_tag_processor.php =================================================================== --- in-commerce/units/orders/orders_tag_processor.php (revision 13241) +++ in-commerce/units/orders/orders_tag_processor.php (working copy) @@ -1393,6 +1393,7 @@ $params['tab_dependant'] = $tab_params['dependant']; $params['show_category'] = $tab_params['special'] == 'showall' ? 1 : 0; // this is advanced view -> show category name + // use $pass_params to be able to pass 'tab_init' parameter from m_ModuleInclude tag return $this->Application->ParseBlock($params, 1); }