[php-blog-cvs] serendipity/plugins/serendipity_event_nl2br serendipity_event_nl2br.php,1.4,1.5

[Garvin H. <gar...@us...>]

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

Modified Files:
	serendipity_event_nl2br.php 
Log Message:
Merge from 'branch-smarty' to HEAD.


Index: serendipity_event_nl2br.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_event_nl2br.php	22 Jun 2004 13:45:45 -0000	1.4
+++ serendipity_event_nl2br.php	19 Nov 2004 11:05:41 -0000	1.5
@@ -21,7 +21,10 @@
 
         $propbag->add('name',          PLUGIN_EVENT_NL2BR_NAME);
         $propbag->add('description',   PLUGIN_EVENT_NL2BR_DESC);
-        $propbag->add('event_hooks', array('frontend_display' => true));
+        $propbag->add('stackable',     false);
+        $propbag->add('author',        'Serendipity Team');
+        $propbag->add('version',       '1.0');
+        $propbag->add('event_hooks',   array('frontend_display' => true));
 
         $this->markup_elements = array(
             array(
@@ -74,6 +77,10 @@
               case 'frontend_display':
 
                 foreach ($this->markup_elements as $temp) {
+                    if (isset($eventData['is_cached']) && $eventData['is_cached'] && ($temp['element'] == 'body' || $temp['element'] == 'extended')) {
+                        continue;
+                    }
+
                     if (serendipity_db_bool($this->get_config($temp['name'], true)) && isset($eventData[$temp['element']])) {
                         $element = $temp['element'];
                         $eventData[$element] = nl2br($eventData[$element]);
@@ -93,4 +100,4 @@
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file