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

nl2br 2.21.9: php8 compat

Browse Source
This commit is contained in:
onli 2021-03-15 23:18:54 +01:00
parent a32bb4f2ee
commit 2261e112eb
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
View File

@ -18,7 +18,7 @@ class serendipity_event_nl2br extends serendipity_event
$propbag->add('description', PLUGIN_EVENT_NL2BR_DESC); $propbag->add('description', PLUGIN_EVENT_NL2BR_DESC);
$propbag->add('stackable', false); $propbag->add('stackable', false);
$propbag->add('author', 'Serendipity Team, Stephan Brunker'); $propbag->add('author', 'Serendipity Team, Stephan Brunker');
$propbag->add('version', '2.21.7'); $propbag->add('version', '2.21.9');
$propbag->add('requirements', array( $propbag->add('requirements', array(
'serendipity' => '1.6', 'serendipity' => '1.6',
'smarty' => '2.6.7', 'smarty' => '2.6.7',
@ -224,10 +224,10 @@ class serendipity_event_nl2br extends serendipity_event
case 'frontend_display': case 'frontend_display':
// check single entry for temporary disabled markups // check single entry for temporary disabled markups
if ( !$eventData['properties']['ep_disable_markup_' . $this->instance] && if ( !($eventData['properties']['ep_disable_markup_' . $this->instance] ?? null) &&
@!in_array($this->instance, $serendipity['POST']['properties']['disable_markups']) && @!in_array($this->instance, ($serendipity['POST']['properties']['disable_markups'] ?? [])) &&
!$eventData['properties']['ep_no_textile'] && !isset($serendipity['POST']['properties']['ep_no_textile']) && !($eventData['properties']['ep_no_textile'] ?? null) && !isset(($serendipity['POST']['properties']['ep_no_textile'])) &&
!$eventData['properties']['ep_no_markdown'] && !isset($serendipity['POST']['properties']['ep_no_markdown'])) { !($eventData['properties']['ep_no_markdown'] ?? null) && !isset($serendipity['POST']['properties']['ep_no_markdown'])) {
// yes, this markup shall be applied // yes, this markup shall be applied
$serendipity['nl2br']['entry_disabled_markup'] = false; $serendipity['nl2br']['entry_disabled_markup'] = false;
} else { } else {
@ -274,9 +274,9 @@ class serendipity_event_nl2br extends serendipity_event
foreach ($this->markup_elements as $temp) { foreach ($this->markup_elements as $temp) {
if (serendipity_db_bool($this->get_config($temp['name'], true)) && isset($eventData[$temp['element']]) && if (serendipity_db_bool($this->get_config($temp['name'], true)) && isset($eventData[$temp['element']]) &&
!$eventData['properties']['ep_disable_markup_' . $this->instance] && !($eventData['properties']['ep_disable_markup_' . $this->instance] ?? null) &&
@!in_array($this->instance, $serendipity['POST']['properties']['disable_markups']) && @!in_array($this->instance, ($serendipity['POST']['properties']['disable_markups'] ?? [])) &&
!$eventData['properties']['ep_no_nl2br'] && !($eventData['properties']['ep_no_nl2br'] ?? null) &&
!isset($serendipity['POST']['properties']['ep_no_nl2br'])) { !isset($serendipity['POST']['properties']['ep_no_nl2br'])) {
$element = $temp['element']; $element = $temp['element'];
@ -344,7 +344,7 @@ class serendipity_event_nl2br extends serendipity_event
if( $isobr ) { if( $isobr ) {
$serendipity['nl2br']['iso2br'] = true; // include to global as also used by staticpages now $serendipity['nl2br']['iso2br'] = true; // include to global as also used by staticpages now
if (!is_object($serendipity['smarty'])) { if (! array_key_exists('smarty', $serendipity) || !is_object($serendipity['smarty'])) {
serendipity_smarty_init(); // if not set to avoid member function assign() on a non-object error, start Smarty templating serendipity_smarty_init(); // if not set to avoid member function assign() on a non-object error, start Smarty templating
} }
@ -355,24 +355,18 @@ class serendipity_event_nl2br extends serendipity_event
case 'css': case 'css':
$eventData .= ' $eventData .= '
/* nl2br plugin start */ /* nl2br plugin start */
p.wl_nobottom { p.wl_nobottom {
margin-bottom: 0em; margin-bottom: 0em;
} }
p.wl_notop { p.wl_notop {
margin-top: 0em; margin-top: 0em;
} }
p.wl_notopbottom { p.wl_notopbottom {
margin-top: 0em; margin-top: 0em;
margin-bottom: 0em; margin-bottom: 0em;
} }
/* nl2br plugin end */ /* nl2br plugin end */
'; ';
break; break;