[ticket/15637] Preserve line breaks in event descriptions

PHPBB3-15637
This commit is contained in:
kasimi 2018-07-07 21:25:29 +02:00
parent 517c601482
commit 245f4df47c
No known key found for this signature in database
GPG key ID: 3163AB573241193A
2 changed files with 2 additions and 2 deletions

View file

@ -281,7 +281,7 @@ class php_exporter
$description_line_num++; $description_line_num++;
} }
$description = trim(implode(' ', $description_lines)); $description = trim(implode('<br/>', $description_lines));
if (isset($this->events[$this->current_event])) if (isset($this->events[$this->current_event]))
{ {

View file

@ -57,7 +57,7 @@ class phpbb_event_php_exporter_test extends phpbb_test_case
'file' => 'extra_description.test', 'file' => 'extra_description.test',
'arguments' => array(), 'arguments' => array(),
'since' => '3.1.0-b2', 'since' => '3.1.0-b2',
'description' => 'Description NOTE: This will also be exported', 'description' => 'Description<br/><br/>NOTE: This will also be exported',
), ),
), ),
), ),