Commit 8fc053d7 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Revert last commit

parent 66158609
...@@ -507,16 +507,16 @@ class Report { ...@@ -507,16 +507,16 @@ class Report {
$content .= $columnValueSeparator; $content .= $columnValueSeparator;
$columnValueSeparator = $this->variables->doVariables($this->frArray[$full_level . "." . TOKEN_RSEP]); $columnValueSeparator = $this->variables->doVariables($this->frArray[$full_level . "." . TOKEN_RSEP]);
//----------------------------- // RBEG
// COLUMNS: Collect all columns
$content .= $this->collectRow($row, $keys, $full_level, $rowIndex);
// RBEG - replace after 'collectRow' to use values from the current row
$rbeg = $this->variables->doVariables($this->frArray[$full_level . "." . TOKEN_RBEG]); $rbeg = $this->variables->doVariables($this->frArray[$full_level . "." . TOKEN_RBEG]);
// RBGD: even/odd rows // RBGD: even/odd rows
$content .= str_replace(TOKEN_RBGD, $arrRbgd[$rowIndex % 2], $rbeg); $content .= str_replace(TOKEN_RBGD, $arrRbgd[$rowIndex % 2], $rbeg);
//-----------------------------
// COLUMNS: Collect all columns
$content .= $this->collectRow($row, $keys, $full_level, $rowIndex);
// REND // REND
$content .= $this->variables->doVariables($this->frArray[$full_level . "." . TOKEN_REND]); $content .= $this->variables->doVariables($this->frArray[$full_level . "." . TOKEN_REND]);
...@@ -525,7 +525,6 @@ class Report { ...@@ -525,7 +525,6 @@ class Report {
// RENR // RENR
$content .= $this->variables->doVariables($this->frArray[$full_level . "." . TOKEN_RENR]); $content .= $this->variables->doVariables($this->frArray[$full_level . "." . TOKEN_RENR]);
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment