backport

diff --git a/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php b/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
index 035c8c41cc6dfbc7d1a0096dbc5e8223dc9d6efb..8bbefe29a19882fe81494163d863d41429ff69ec 100644 (file)
--- a/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
+++ b/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
@@ -21,7 +21,7 @@ class serendipity_event_nl2br extends serendipity_event
         $propbag->add('description',   PLUGIN_EVENT_NL2BR_DESC);
         $propbag->add('stackable',     false);
         $propbag->add('author',        'Serendipity Team');
-        $propbag->add('version',       '1.2');
+        $propbag->add('version',       '1.3');
         $propbag->add('requirements',  array(
             'serendipity' => '0.8',
             'smarty'      => '2.6.7',
@@ -90,7 +90,8 @@ 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_no_nl2br']) {
+                            !$eventData['properties']['ep_no_nl2br'] &&
+                            !isset($serendipity['POST']['properties']['no_nl2br'])) {
                         $element = $temp['element'];
                         $eventData[$element] = nl2br($eventData[$element]);
                     }