Merge branch 'Release02x01'

foswiki · Nov 10, 2016 · 3a028c5 · 3a028c5
2 parents c124831 + 246450c
commit 3a028c5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/TML2HTML.pm b/WysiwygPlugin/lib/Foswiki/Plugins/WysiwygPlugin/TML2HTML.pm
@@ -745,15 +745,16 @@ s/((^|(?<=[-*\s(]))$Foswiki::regex{linkProtocolPattern}:[^\s<>"]+[^\s*.,!?;:)<])
         elsif ($inList
             && $line =~ s/^([ \t]+)/$this->_hideWhitespace("\n$1")/e )
         {
-
             # Extend text of previous list item by dropping through
             $result[-1] .= $line;
             $line = '';
 
         }
         elsif ( $line =~ /^<hr class="TMLhr"/ ) {
             push( @result, '</p>' ) if $inParagraph;
+            $this->_addListItem( \@result, '', '', '' ) if $inList;
             $inParagraph = 0;
+            $inList      = 0;
         }
         elsif ( $line eq $tableAndMacrosDivStart ) {
             push( @result, '</p>' ) if $inParagraph;

diff --git a/WysiwygPlugin/test/unit/WysiwygPlugin/TranslatorTests.pm b/WysiwygPlugin/test/unit/WysiwygPlugin/TranslatorTests.pm
@@ -488,6 +488,22 @@ HERE
 HERE
     },
 
+    {
+        exec => ROUNDTRIP,
+        name => 'HRFollowinglist',
+        tml  => <<'HERE',
+   * List entry
+---
+New para
+HERE
+        finaltml => <<'HERE',
+   * List entry
+---
+
+New para
+HERE
+    },
+
     {
         exec => ROUNDTRIP,
         name => 'centering',