revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-02-16 16:58:38 +01:00
Code Issues Releases Wiki Activity

Fix an issue where intracontent empty lines were incorrectly trimmed in quoted blocks

Browse source 
Summary: Fixes T13335. When processing quoted blocks, we remove leading empty lines. This logic incorrectly continued after encountering a nonempty line.

Test Plan: Added a test, made it pass. Previewed blocks in web UI.

Maniphest Tasks: T13335

Differential Revision: https://secure.phabricator.com/D20965
This commit is contained in:
epriestley 2020-02-04 08:03:28 -08:00
parent 0f1acb6cef
commit 84fd5cd5bb
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/infrastructure/markup/PhabricatorMarkupEngine.php
View file

@ -42,7 +42,7 @@ final class PhabricatorMarkupEngine extends Phobject {
private $objects = array(); private $objects = array();
private $viewer; private $viewer;
private $contextObject; private $contextObject;
private $version = 19; private $version = 20;
private $engineCaches = array(); private $engineCaches = array();
private $auxiliaryConfig = array(); private $auxiliaryConfig = array();

2
src/infrastructure/markup/blockrule/PhutilRemarkupQuotedBlockRule.php
View file

@ -66,6 +66,8 @@ abstract class PhutilRemarkupQuotedBlockRule
foreach ($text as $key => $line) { foreach ($text as $key => $line) {
if (!strlen(trim($line))) { if (!strlen(trim($line))) {
unset($text[$key]); unset($text[$key]);
} else {
break;
} }
} }

11
src/infrastructure/markup/remarkup/__tests__/remarkup/quoted-paragraphs.txt Normal file
View file

@ -0,0 +1,11 @@
> x
>
> y
~~~~~~~~~~
<blockquote><p>x</p>
<p>y</p></blockquote>
~~~~~~~~~~
> x
>
> y