Index: branches/5.0.x/core/units/email_events/email_events_event_handler.php =================================================================== diff -u -r12299 -r12323 --- branches/5.0.x/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 12299) +++ branches/5.0.x/core/units/email_events/email_events_event_handler.php (.../email_events_event_handler.php) (revision 12323) @@ -1,6 +1,6 @@ Application->InitParser(); $parser_params = $this->Application->Parser->Params; // backup parser params - // ==== for TemplateParser class only: begin ==== -// $parser_pattern = $this->Application->Parser->Pattern; -// $parser_values = $this->Application->Parser->Values; -// $this->Application->Parser->Pattern = Array(); // fixes bug in TemplateParser::SortParams -// $this->Application->Parser->Values = Array(); // fixes bug in TemplateParser::SortParams - // ==== for TemplateParser class only: end ==== - $this->Application->Parser->SetParams( array_merge_recursive2($parser_params, $direct_params) ); $message = implode('&|&', explode("\n\n", $message, 2)); // preserves double \n in case when tag is located in subject field $message = $this->Application->Parser->Parse($message, 'email_template', 0); - // ==== for TemplateParser class only: begin ==== -// $this->Application->Parser->Pattern = $parser_pattern; -// $this->Application->Parser->Values = $parser_values; - // ==== for TemplateParser class only: end ==== - $this->Application->Parser->SetParams($parser_params); // restore parser params // 2. replace line endings, that are send with data submitted via request