mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-22 08:30:26 +01:00
Code Issues Releases Wiki Activity

Merge pull request #5198 from kasimi/ticket/15637

Browse Source 
[ticket/15637] Extract multi-line PHP event descriptions

* github.com:/phpbb/phpbb:
  [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
commit 5542070169
3 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
phpBB/phpbb/event/php_exporter.php
View File

@ -264,7 +264,30 @@ class php_exporter
// Find event description line
$description_line_num = $this->find_description();
$description = substr(trim($this->file_lines[$description_line_num]), strlen('* '));
$description_lines = array();
while (true)
{
$description_line = substr(trim($this->file_lines[$description_line_num]), strlen('*'));
$description_line = trim(str_replace("\t", " ", $description_line));
// Reached end of description if line is a tag
if (strlen($description_line) && $description_line[0] == '@')
{
break;
}
$description_lines[] = $description_line;
$description_line_num++;
}
// If there is an empty line between description and first tag, remove it
if (!strlen(end($description_lines)))
{
array_pop($description_lines);
}
$description = trim(implode('<br/>', $description_lines));
if (isset($this->events[$this->current_event]))
{

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',
),
),
),