diff --git a/include/functions_smarty.inc.php b/include/functions_smarty.inc.php
index 01721c80..a9e87486 100644
--- a/include/functions_smarty.inc.php
+++ b/include/functions_smarty.inc.php
@@ -70,7 +70,12 @@ function &serendipity_printTrackbacks(&$trackbacks) {
 function &serendipity_smarty_fetch($block, $file, $echo = false) {
     global $serendipity;
 
-    $output =& $serendipity['smarty']->fetch('file:'. serendipity_getTemplateFile($file, 'serendipityPath'), null, null, ($echo === true && $serendipity['smarty_raw_mode']));
+    if (strpos($serendipity['smarty']->_version, '2', 1)) {
+        $output =& $serendipity['smarty']->fetch('file:'. serendipity_getTemplateFile($file, 'serendipityPath'), null, null, ($echo === true && $serendipity['smarty_raw_mode']));
+    } else {
+        $output =& $serendipity['smarty']->fetch('file:'. serendipity_getTemplateFile($file, 'serendipityPath'), null, null, null, ($echo === true && $serendipity['smarty_raw_mode']));
+    }
+
     $serendipity['smarty']->assign_by_ref($block, $output);
 
     return $output;
diff --git a/templates/carl_contest/entries_summary.tpl b/templates/carl_contest/entries_summary.tpl
index cbeac8cb..949a6647 100644
--- a/templates/carl_contest/entries_summary.tpl
+++ b/templates/carl_contest/entries_summary.tpl
@@ -2,8 +2,8 @@
 <div class='serendipity_date'>{$CONST.TOPICS_OF} {$dateRange.0|@formatTime:"%B, %Y"}</div>
 
 <div class="serendipity_entry">
-    {foreach from=$entries item="entries"}
-        {foreach from=$entries.entries item="entry"}
+    {foreach from=$entries item="sentries"}
+        {foreach from=$sentries.entries item="entry"}
             <div class="archive_summary"><h4 class="archive_summary_title">{$entry.id} - <a href="{$entry.link}">{$entry.title|truncate:80:" ..."}</a></h4>
 {$entry.timestamp|@formatTime:DATE_FORMAT_ENTRY}. {$CONST.POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a> {if $entry.categories} {$CONST.IN} {foreach from=$entry.categories item="entry_category" name="categories"}<a href="{$entry_category.category_link}">{$entry_category.category_name|@escape}</a>{/foreach}{/if}</div>
 	{/foreach}
diff --git a/templates/default-php/entries_summary.tpl b/templates/default-php/entries_summary.tpl
index 584c47f9..1ab3b9fa 100644
--- a/templates/default-php/entries_summary.tpl
+++ b/templates/default-php/entries_summary.tpl
@@ -3,8 +3,8 @@
 
 <div class="serendipity_entry">
     <ul>
-    {foreach from=$entries item="entries"}
-        {foreach from=$entries.entries item="entry"}
+    {foreach from=$entries item="sentries"}
+        {foreach from=$sentries.entries item="entry"}
             <li><a href="<?= $entry['link'] ?>"><?= $entry['title'] ?></a>
                 <div class="summary_posted_by"><?= POSTED_BY ?> <span class="posted_by_author"><?= $entry['author'] ?></span> <?= ON ?> <span class="posted_by_date">{$entry.timestamp|@formatTime:DATE_FORMAT_ENTRY}</span></div></li>
         <?php endforeach; ?>
diff --git a/templates/default-rtl/entries_summary.tpl b/templates/default-rtl/entries_summary.tpl
index 3074c4ba..537f4b1c 100644
--- a/templates/default-rtl/entries_summary.tpl
+++ b/templates/default-rtl/entries_summary.tpl
@@ -3,8 +3,8 @@
 
 <div class="serendipity_entry">
     <ul>
-    {foreach from=$entries item="entries"}
-        {foreach from=$entries.entries item="entry"}
+    {foreach from=$entries item="sentries"}
+        {foreach from=$sentries.entries item="entry"}
             <li><a href="{$entry.link}">{$entry.title}</a>
                 <br />{$CONST.POSTED_BY} {$entry.author} {$CONST.ON} {$entry.timestamp|@formatTime:DATE_FORMAT_ENTRY}</li>
         {/foreach}
diff --git a/templates/default/entries_summary.tpl b/templates/default/entries_summary.tpl
index c8b526c9..ee067109 100644
--- a/templates/default/entries_summary.tpl
+++ b/templates/default/entries_summary.tpl
@@ -3,8 +3,8 @@
 
 <div class="serendipity_entry">
     <ul>
-    {foreach from=$entries item="entries"}
-        {foreach from=$entries.entries item="entry"}
+    {foreach from=$entries item="sentries"}
+        {foreach from=$sentries.entries item="entry"}
             <li><a href="{$entry.link}">{$entry.title}</a>
                 <div class="summary_posted_by">{$CONST.POSTED_BY} <span class="posted_by_author">{$entry.author}</span> {$CONST.ON} <span class="posted_by_date">{$entry.timestamp|@formatTime:DATE_FORMAT_ENTRY}</span></div></li>
         {/foreach}
diff --git a/templates/wp/entries_summary.tpl b/templates/wp/entries_summary.tpl
index 4e92b7e1..538ad3b2 100644
--- a/templates/wp/entries_summary.tpl
+++ b/templates/wp/entries_summary.tpl
@@ -2,9 +2,9 @@
 <div class='serendipity_date'>{$CONST.TOPICS_OF} {$dateRange.0|@formatTime:"%B, %Y"}</div>
 
 <div class="serendipity_entry">
-    {foreach from=$entries item="entries"}
+    {foreach from=$entries item="sentries"}
         <ul>
-        {foreach from=$entries.entries item="entry"}
+        {foreach from=$sentries.entries item="entry"}
             <li><a href="{$entry.link}">{$entry.title}</a>
                 <br />{$CONST.POSTED_BY} {$entry.username} {$CONST.ON} {$entry.timestamp|@formatTime:DATE_FORMAT_ENTRY}</li>
         {/foreach}