- {$CONST:DONE}: {$save_time}
+ {$CONST.DONE}: {$save_time}
{/if}
diff --git a/include/plugin_api.inc.php b/include/plugin_api.inc.php
index 1c4c3e24..2078673b 100644
--- a/include/plugin_api.inc.php
+++ b/include/plugin_api.inc.php
@@ -1577,7 +1577,7 @@ class serendipity_plugin
$tfile = dirname($this->pluginFile) . '/' . $filename;
}
- if( !SMARTY_VERSION ) {
+ if( !defined('Smarty::SMARTY_VERSION') ) {
$inclusion = $serendipity['smarty']->security_settings[@INCLUDE_ANY];
$serendipity['smarty']->security_settings[@INCLUDE_ANY] = true;
$content = $serendipity['smarty']->fetch('file:'. $tfile);
diff --git a/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php b/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
index e4feaf3e..36ba631d 100644
--- a/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
+++ b/plugins/serendipity_event_nl2br/serendipity_event_nl2br.php
@@ -1,4 +1,5 @@
-add('description', PLUGIN_EVENT_NL2BR_DESC);
$propbag->add('stackable', false);
$propbag->add('author', 'Serendipity Team');
- $propbag->add('version', '2.13');
+ $propbag->add('version', '2.14');
$propbag->add('requirements', array(
'serendipity' => '0.8',
'smarty' => '2.6.7',
@@ -247,6 +248,8 @@ class serendipity_event_nl2br extends serendipity_event
// check single entry for temporary disabled markups
if( $isobr ) {
+ $serendipity['nl2br']['iso2br'] = true; // include to global as also used by staticpages now
+
if (!is_object($serendipity['smarty'])) {
serendipity_smarty_init(); // if not set to avoid member function assign() on a non-object error, start Smarty templating
}
diff --git a/templates/2k11/comments.tpl b/templates/2k11/comments.tpl
index 74f9e747..9f9fcaca 100644
--- a/templates/2k11/comments.tpl
+++ b/templates/2k11/comments.tpl
@@ -1,7 +1,7 @@
{foreach from=$comments item=comment name="comments"}