Index: branches/5.0.x/core/kernel/db/db_tag_processor.php =================================================================== diff -u -r13243 -r13272 --- branches/5.0.x/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 13243) +++ branches/5.0.x/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 13272) @@ -1,6 +1,6 @@ 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; }