diff options
| author | kasimi <mail@kasimi.net> | 2018-07-07 21:25:29 +0200 |
|---|---|---|
| committer | kasimi <mail@kasimi.net> | 2018-07-07 21:25:43 +0200 |
| commit | 245f4df47c0d33ef8fe83bc5fd049a1afda79bb1 (patch) | |
| tree | 00b15691c7118f20bc9f72c03b8d9f9471996b1e | |
| parent | 517c601482b9400a6b6d72c04791c534e0170622 (diff) | |
| download | forums-245f4df47c0d33ef8fe83bc5fd049a1afda79bb1.tar forums-245f4df47c0d33ef8fe83bc5fd049a1afda79bb1.tar.gz forums-245f4df47c0d33ef8fe83bc5fd049a1afda79bb1.tar.bz2 forums-245f4df47c0d33ef8fe83bc5fd049a1afda79bb1.tar.xz forums-245f4df47c0d33ef8fe83bc5fd049a1afda79bb1.zip | |
[ticket/15637] Preserve line breaks in event descriptions
PHPBB3-15637
| -rw-r--r-- | phpBB/phpbb/event/php_exporter.php | 2 | ||||
| -rw-r--r-- | tests/event/php_exporter_test.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/event/php_exporter.php b/phpBB/phpbb/event/php_exporter.php index eae6a7bf28..15dd13190e 100644 --- a/phpBB/phpbb/event/php_exporter.php +++ b/phpBB/phpbb/event/php_exporter.php @@ -281,7 +281,7 @@ class php_exporter $description_line_num++; } - $description = trim(implode(' ', $description_lines)); + $description = trim(implode('<br/>', $description_lines)); if (isset($this->events[$this->current_event])) { diff --git a/tests/event/php_exporter_test.php b/tests/event/php_exporter_test.php index 0d40cc3e70..c6670e1340 100644 --- a/tests/event/php_exporter_test.php +++ b/tests/event/php_exporter_test.php @@ -57,7 +57,7 @@ class phpbb_event_php_exporter_test extends phpbb_test_case 'file' => 'extra_description.test', 'arguments' => array(), 'since' => '3.1.0-b2', - 'description' => 'Description NOTE: This will also be exported', + 'description' => 'Description<br/><br/>NOTE: This will also be exported', ), ), ), |