mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

[event nl2br] fix concatenation and spaces between newlines

Browse Source
This commit is contained in:
stephanbrunker 2020-04-23 00:05:22 +02:00
parent c694fb0f45
commit 928f220c5a
2 changed files with 14 additions and 6 deletions
plugins/serendipity_event_nl2br
Changelogserendipity_event_nl2br.php

12
plugins/serendipity_event_nl2br/Changelog

@ -1,5 +1,13 @@
2.21.3: Include figure and figcaption tags.
Thanks to @stephanbrunker!
2.21.5: * nl2p: if the double newline contains spaces, e.g. \n \n, these
spaces are now ignored
* fixed the direct concatenation: if the body ends without a newline
and the extended starts without, there is no margin between
the paragraphs (was broken)
2.21.4: * changed <a> tags to html5 - can now include every block element
* added a new function which processes html comments. Now everything
inside an html comment is ignored
2.21.3: Include figure and figcaption tags.
Thanks to @stephanbrunker!

8
plugins/serendipity_event_nl2br/serendipity_event_nl2br.php

@ -18,7 +18,7 @@ class serendipity_event_nl2br extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_NL2BR_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Serendipity Team, Stephan Brunker');
$propbag->add('version', '2.21.4');
$propbag->add('version', '2.21.5');
$propbag->add('requirements', array(
'serendipity' => '1.6',
'smarty' => '2.6.7',
@ -294,9 +294,9 @@ class serendipity_event_nl2br extends serendipity_event
//but with obligatory break because of the independent div-elements
// rules for body <-> extended:
// no margins only if body ends with \n or no \n and extended starts without \n
// no margins only if body ends without \n and extended starts without \n
// means: concatenate body and extended and there is no whiteline between them
if ($element == 'body' && isset($eventData['extended']) && !(strspn($text,"\n",-1) > 1) && strspn($eventData['extended'],"\n") )
if ($element == 'body' && isset($eventData['extended']) && !strspn($text,"\n",-1) && !strspn($eventData['extended'],"\n") )
{
$text = "\n" . $text;
}
@ -892,7 +892,7 @@ p.wl_notopbottom {
{
// whiteline \n\n found: make paragraph with buffer and this line
if ( ($j < count($textline) - 1 && empty($textline[$j+1]) ) )
if ( ($j < count($textline) - 1 && empty(trim($textline[$j+1])) ) )
{
// p start tag, append buffer and empty buffer
if ($firstp && !$startnl) { $content .= self::P_NOTOP . $buffer; }