Commit bc8b6a04 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge branch 'master' into Feature#4255AttachmentsFuerEmails

parents 66a20e95 5d714a1b
......@@ -486,8 +486,8 @@ abstract class AbstractBuildForm {
}
$storeRecord = $this->store->getStore(STORE_RECORD);
$value = $this->report->process($this->bodytextParser->process($value));
$this->store->setStore(STORE_RECORD, $storeRecord, true);
$value = $this->report->process($this->bodytextParser->process($value), false);
$this->store->setStore($storeRecord, STORE_RECORD, true);
}
......
......@@ -83,6 +83,8 @@ class Report {
private $showDebugInfoFlag = false;
private $flagFillStoreRecord = true;
/**
* Report constructor.
*
......@@ -167,12 +169,13 @@ class Report {
*
* @return string
*/
public function process($bodyText) {
public function process($bodyText, $flagFillStoreRecord = true) {
//phpUnit Test: clean environment
$this->frArray = array();
$this->indexArray = array();
$this->levelCount = 0;
$this->flagFillStoreRecord = $flagFillStoreRecord;
// Iteration over Bodytext
$ttLineArray = explode("\n", $bodyText);
......@@ -601,7 +604,9 @@ class Report {
}
}
$this->store->appendToStore(STORE_RECORD, $assoc);
if ($this->flagFillStoreRecord) {
$this->store->appendToStore(STORE_RECORD, $assoc);
}
return ($content);
}
......
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