[php-blog-cvs] serendipity/plugins/serendipity_event_nl2br serendipity_event_nl2br.php,1.8,1.9

[Philip H. <pi...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_nl2br
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3889/plugins/serendipity_event_nl2br

Modified Files:
	serendipity_event_nl2br.php 
Log Message:
Honor no_nl2br-entry-property before nl2br()ing an entry

Index: serendipity_event_nl2br.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_event_nl2br.php	4 Jan 2005 10:06:36 -0000	1.8
+++ serendipity_event_nl2br.php	5 Jan 2005 12:43:22 -0000	1.9
@@ -31,7 +31,7 @@
         $propbag->add('description',   PLUGIN_EVENT_NL2BR_DESC);
         $propbag->add('stackable',     false);
         $propbag->add('author',        'Serendipity Team');
-        $propbag->add('version',       '1.0');
+        $propbag->add('version',       '1.1');
         $propbag->add('cachable_events', array('frontend_display' => true));
         $propbag->add('event_hooks',   array('frontend_display' => true));
 
@@ -93,7 +93,8 @@
               case 'frontend_display':
 
                 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_no_nl2br']) {
                         $element = $temp['element'];
                         $eventData[$element] = nl2br($eventData[$element]);
                     }