Line break filter will ignore everything following a <pre>xxx</pre>

This is a regression introduced by #559584: filter_xss() and Line break filter break HTML comments.

#1029108: Comments confuse line/paragraph filter and #1054632: Lines and paragraphs stop converting to individual p and br tags after pre tag. are related or result from the same problem.

Marked #1029108: Comments confuse line/paragraph filter and #1054632: Lines and paragraphs stop converting to individual p and br tags after pre tag. because those two fail to realize that the logic around comments is currently completely bogus: a comment will reset the ignore mode so any comment in a <pre> tag for example would make the text after the comment replaced for paragraphs.

So needs work here for:

• Adding back here the test for comments from #1029108: Comments confuse line/paragraph filter and its fix for the verbose mode
• Adding a test for comments inside <pre> tags

Why do we fiddle with IFRAMEs here though? That's tackled in #810824: Line break filter adds paragraphs around <iframe> elements already.

The hunk about the iframe is necessary because we have a test for it:

      // Skip contents of certain block tags entirely.
      "<script>aaa\nbbb\n\nccc</script>
<style>aaa\nbbb\n\nccc</style>
<pre>aaa\nbbb\n\nccc</pre>
<object>aaa\nbbb\n\nccc</object>
<iframe>aaa\nbbb\n\nccc</iframe>
" => array(
        "<script>aaa\nbbb\n\nccc</script>" => TRUE,
        "<style>aaa\nbbb\n\nccc</style>" => TRUE,
        "<pre>aaa\nbbb\n\nccc</pre>" => TRUE,
        "<object>aaa\nbbb\n\nccc</object>" => TRUE,
        "<iframe>aaa\nbbb\n\nccc</iframe>" => TRUE,
      ),

The test currently passes because of this bug (anything after the first <script> will be ignored by the line break filter anyway).

Cross post.

This looks good to me.

Quick summary: this patch fixes the comment handling logic introduced by #559584: filter_xss() and Line break filter break HTML comments. When the line-break filter bumps into a comment, it should just ignore it. Comments should not affect the state of the line-break filter, and should have no effect on whether or not the line-break filter should process content before or after the comment.

Two related changes are in the patch:

• adding <iframe> to the list of ignored elements: we had a test for it, but it was only passing because of this bug
• a cosmetic fix to the verbose output of the filter test, already vetted by Sun in #1029108: Comments confuse line/paragraph filter

This looks ready to go in for me, but I worked with Haza on that patch, so I will wait for someone else to RTBC.

Yup, ready to fly.

Committed to CVS HEAD. Thanks.

I've also seen this behavior on d.o after

tags. Dunno if this is related - and if it is, if it should be backported ?

It seems that the line break filter diverged between D6 and D7. This was not supposed to happen...

Grr. My #15 should have read :

I've also seen this behavior on d.o after <code> tags. Dunno if this is related - and if it is, if it should be backported ?

For people searching the issue queue for bugs it helpful to mention that this fix fixes the following bug also:

The teaser <!--break--> comment tag breaks the 'Convert line breaks into HTML (i.e. <br> and <p>)' filter.