[php-blog-cvs] serendipity/plugins/serendipity_event_textwiki serendipity_event_textwiki.php,1.7,1.8

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

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

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


Index: serendipity_event_textwiki.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_textwiki/serendipity_event_textwiki.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_event_textwiki.php	6 Sep 2004 09:26:28 -0000	1.7
+++ serendipity_event_textwiki.php	19 Nov 2004 11:06:00 -0000	1.8
@@ -468,7 +468,10 @@
 
         $propbag->add('name',          PLUGIN_EVENT_TEXTWIKI_NAME);
         $propbag->add('description',   PLUGIN_EVENT_TEXTWIKI_DESC);
-        $propbag->add('event_hooks', array('frontend_display' => true, 'frontend_comment' => true));
+        $propbag->add('stackable',     false);
+        $propbag->add('author',        'Tobias Schlitt');
+        $propbag->add('version',       '1.0');
+        $propbag->add('event_hooks',   array('frontend_display' => true, 'frontend_comment' => true));
 
         $this->markup_elements = array(
             array(
@@ -574,6 +577,10 @@
             switch($event) {
                 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] = $this->wiki->transform($eventData[$element]);