mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 11:13:59 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source 
* 3.2.x:
  [ticket/15637] Remove trailing space from description
  [ticket/15637] Preserve line breaks in event descriptions
  [ticket/15637] Updated test fixture to include complete event description
  [ticket/15637] Remove trailing space from description
  [ticket/15637] Fixed removing white-spaces from description line
  [ticket/15637] Extract all lines before the first @tag
  [ticket/15637] Extract multi-line PHP event descriptions
This commit is contained in:
Tristan Darricau
2018-07-08 18:14:20 +02:00
parent aa2ed924a8 5542070169
commit 6c53a68ee1
3 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/event/fixtures/extra_description.test
View File

@@ -3,7 +3,7 @@
/**
* Description
*
* NOTE: This will not be exported
* NOTE: This will also be exported
*
* @event extra_description.dispatch
* @since 3.1.0-b2

2
tests/event/php_exporter_test.php
View File

@@ -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',
'description' => 'Description<br/><br/>NOTE: This will also be exported',
),
),
),