re-added some lost code by last commit to smartymarkup

s9y · Jan 31, 2012 · 16f1dfe · 16f1dfe
1 parent f4c46db
commit 16f1dfe
Showing 1 changed file with 16 additions and 13 deletions.
diff --git a/serendipity_event_smartymarkup/serendipity_event_smartymarkup.php b/serendipity_event_smartymarkup/serendipity_event_smartymarkup.php
@@ -145,23 +145,26 @@ function smartymarkup($input, &$eventData) {
             serendipity_smarty_init();
         }
 
-        if( isset($serendipity['smarty']->_version) ) {
-            $serendipity['smarty']->register_resource("smartymarkupplugin", array(
-                                   "smarty_resource_smartymarkupplugin_template",
-                                   "smarty_resource_smartymarkupplugin_timestamp",
-                                   "smarty_resource_smartymarkupplugin_secure",
-                                   "smarty_resource_smartymarkupplugin_trusted"));
-        } else {
-            // Smarty 3.1 >=
-            $serendipity['smarty']->registerResource("smartymarkupplugin", array(
-                                   array( $this, "smarty_resource_smartymarkupplugin_template" ),
-                                   array( $this, "smarty_resource_smartymarkupplugin_timestamp" ),
-                                   array( $this, "smarty_resource_smartymarkupplugin_secure" ),
-                                   array( $this, "smarty_resource_smartymarkupplugin_trusted" )));
+        if (!isset($serendipity['PLUGINDATA']['smartymarkupplugin'])) {
+            if( isset($serendipity['smarty']->_version) ) {
+                $serendipity['smarty']->register_resource("smartymarkupplugin", array(
+                                       "smarty_resource_smartymarkupplugin_template",
+                                       "smarty_resource_smartymarkupplugin_timestamp",
+                                       "smarty_resource_smartymarkupplugin_secure",
+                                       "smarty_resource_smartymarkupplugin_trusted"));
+            } else {
+                // Smarty 3.1 >=
+                $serendipity['smarty']->registerResource("smartymarkupplugin", array(
+                                       array( $this, "smarty_resource_smartymarkupplugin_template" ),
+                                       array( $this, "smarty_resource_smartymarkupplugin_timestamp" ),
+                                       array( $this, "smarty_resource_smartymarkupplugin_secure" ),
+                                       array( $this, "smarty_resource_smartymarkupplugin_trusted" )));
+            }
         }
 
         $serendipity['PLUGINDATA']['smartymarkupplugin'] =& $input;
         $serendipity['smarty']->assign('smartymarkup_eventData', $eventData);
+
         // avoid non existing or empty template fetch calls
         if(isset($serendipity['PLUGINDATA']['smartymarkupplugin']) && !empty($serendipity['PLUGINDATA']['smartymarkupplugin'])) {
             return $serendipity['smarty']->fetch('smartymarkupplugin:' . crc32($serendipity['PLUGINDATA']['smartymarkupplugin']));