From e6077f5ac7fe429c2a166cd9288edd4dfaa6312a Mon Sep 17 00:00:00 2001
From: Ian <aristophian@googlemail.com>
Date: Fri, 8 Jan 2016 10:56:36 +0100
Subject: [PATCH] nl2br - try to fix commit
fe6fc9eb74e6be8d6fae33c428e4fd587720dfbf
which accidently disabled nl2br to run true
---
plugins/serendipity_event_nl2br/serendipity_event_nl2br.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php b/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
index d149d81e..2b5ae6be 100644
--- a/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
+++ b/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
@@ -209,7 +209,7 @@ class serendipity_event_nl2br extends serendipity_event
// check single entry for temporary disabled markups
if ( !$eventData['properties']['ep_disable_markup_' . $this->instance] &&
- (isset($serendipity['POST']['properties']['disable_markups']) && !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_markdown'] && !isset($serendipity['POST']['properties']['ep_no_markdown'])) {
// yes, this markup shall be applied
@@ -247,7 +247,7 @@ class serendipity_event_nl2br extends serendipity_event
foreach ($this->markup_elements as $temp) {
if (serendipity_db_bool($this->get_config($temp['name'], true)) && isset($eventData[$temp['element']]) &&
!$eventData['properties']['ep_disable_markup_' . $this->instance] &&
- (isset($serendipity['POST']['properties']['disable_markups']) && !in_array($this->instance, $serendipity['POST']['properties']['disable_markups'])) &&
+ @!in_array($this->instance, $serendipity['POST']['properties']['disable_markups']) &&
!$eventData['properties']['ep_no_nl2br'] &&
!isset($serendipity['POST']['properties']['ep_no_nl2br'])) {