From: garvinhicking <garvinhicking>
Date: Mon, 20 Feb 2006 10:14:23 +0000 (+0000)
Subject: backport
X-Git-Tag: 1.0~85
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=e9ed2401858220669e1202596bcc861fb87f6fe8;p=s9y.git

backport
---

diff --git a/templates/carl_contest/entries.tpl b/templates/carl_contest/entries.tpl
index be7f513..1b51878 100644
--- a/templates/carl_contest/entries.tpl
+++ b/templates/carl_contest/entries.tpl
@@ -14,9 +14,9 @@
        <div class='serendipity_entryFooter'>
 		{if $entry.categories}
             <span class="serendipity_entryIcon">
-            {foreach from=$entry.categories item="category"}
-                {if $category.category_icon}
-                    <a href="{$category.category_link}"><img class="serendipity_entryIcon" title="{$category.category_name|@escape}{$category.category_description|@emptyPrefix}" alt="{$category.category_name|@escape}" src="{$category.category_icon}" /></a>
+            {foreach from=$entry.categories item="entry_category"}
+                {if $entry_category.category_icon}
+                    <a href="{$entry_category.category_link}"><img class="serendipity_entryIcon" title="{$entry_category.category_name|@escape}{$entry_category.category_description|@emptyPrefix}" alt="{$entry_category.category_name|@escape}" src="{$entry_category.category_icon}" /></a>
                 {/if}
             {/foreach}
             </span>
@@ -24,12 +24,12 @@
 			{if $is_single_entry}
 			{$CONST.POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a>
 			{if $entry.categories}
-                   	{$CONST.IN} {foreach from=$entry.categories item="category" name="categories"}<a href="{$category.category_link}">						{$category.category_name|@escape}</a>{if not $smarty.foreach.categories.last}, {/if}{/foreach}
+                   	{$CONST.IN} {foreach from=$entry.categories item="entry_category" name="categories"}<a href="{$entry_category.category_link}">						{$entry_category.category_name|@escape}</a>{if not $smarty.foreach.categories.last}, {/if}{/foreach}
                 {/if}
 			<br />
 			{else}<a href="{$entry.link}">{$entry.title|@default:$entry.body|truncate:40:" ..."}</a> {$CONST.POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a>
                 {if $entry.categories}
-                   {$CONST.IN} {foreach from=$entry.categories item="category" name="categories"}<a href="{$category.category_link}">{$category.category_name|@escape}</a>{if not $smarty.foreach.categories.last}, {/if}{/foreach}
+                   {$CONST.IN} {foreach from=$entry.categories item="entry_category" name="categories"}<a href="{$entry_category.category_link}">{$entry_category.category_name|@escape}</a>{if not $smarty.foreach.categories.last}, {/if}{/foreach}
                 {/if}
                 {if $dategroup.is_sticky}
                     {$CONST.ON}
diff --git a/templates/carl_contest/entries_summary.tpl b/templates/carl_contest/entries_summary.tpl
index 621528b..cbeac8c 100644
--- a/templates/carl_contest/entries_summary.tpl
+++ b/templates/carl_contest/entries_summary.tpl
@@ -5,7 +5,7 @@
     {foreach from=$entries item="entries"}
         {foreach from=$entries.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="category" name="categories"}<a href="{$category.category_link}">{$category.category_name|@escape}</a>{/foreach}{/if}</div>
+{$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}
     {/foreach}
 
diff --git a/templates/competition/entries.tpl b/templates/competition/entries.tpl
index af9eb52..717826c 100644
--- a/templates/competition/entries.tpl
+++ b/templates/competition/entries.tpl
@@ -17,9 +17,9 @@
             {if $entry.categories}
 <!--
             <span class="serendipity_entryIcon">
-            {foreach from=$entry.categories item="category"}
-                {if $category.category_icon}
-                    <a href="{$category.category_link}"><img class="serendipity_entryIcon" title="{$category.category_name|@escape}{$category.category_description|@emptyPrefix}" alt="{$category.category_name|@escape}" src="{$category.category_icon}" /></a>
+            {foreach from=$entry.categories item="entry_category"}
+                {if $entry_category.category_icon}
+                    <a href="{$entry_category.category_link}"><img class="serendipity_entryIcon" title="{$entry_category.category_name|@escape}{$entry_category.category_description|@emptyPrefix}" alt="{$entry_category.category_name|@escape}" src="{$entry_category.category_icon}" /></a>
                 {/if}
             {/foreach}
             </span>
@@ -41,7 +41,7 @@
             <div class='serendipity_entryFooter'>
                 {$CONST.POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a>
                 {if $entry.categories}
-                   {$CONST.IN} {foreach from=$entry.categories item="category" name="categories"}<a href="{$category.category_link}">{$category.category_name|@escape}</a>{if not $smarty.foreach.categories.last}, {/if}{/foreach}
+                   {$CONST.IN} {foreach from=$entry.categories item="entry_category" name="categories"}<a href="{$entry_category.category_link}">{$entry_category.category_name|@escape}</a>{if not $smarty.foreach.categories.last}, {/if}{/foreach}
                 {/if}
 
                 {if $dategroup.is_sticky}
diff --git a/templates/contest/entries.tpl b/templates/contest/entries.tpl
index e67123a..0aab052 100644
--- a/templates/contest/entries.tpl
+++ b/templates/contest/entries.tpl
@@ -16,7 +16,7 @@
         <div class="serendipity_title_footer">
             <span class="serendipity_footer_postedby">{$CONST.POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a></span>
             {if $entry.categories}
-            <span class="serendipity_footer_categories">{$CONST.IN} {foreach from=$entry.categories item="category" name="categories"}<a href="{$category.category_link}">{$category.category_name|@escape}</a>{if not $smarty.foreach.categories.last}, {/if}{/foreach}</span>
+            <span class="serendipity_footer_categories">{$CONST.IN} {foreach from=$entry.categories item="entry_category" name="categories"}<a href="{$entry_category.category_link}">{$entry_category.category_name|@escape}</a>{if not $smarty.foreach.categories.last}, {/if}{/foreach}</span>
             {/if}
 
             <span class="serendipity_footer_posted">
@@ -53,9 +53,9 @@
         <div class="serendipity_entry serendipity_entry_author_{$entry.author|@makeFilename} {if $entry.is_entry_owner}serendipity_entry_author_self{/if}">
             {if $entry.categories}
             <span class="serendipity_entryIcon">
-            {foreach from=$entry.categories item="category"}
-                {if $category.category_icon}
-                    <a href="{$category.category_link}"><img class="serendipity_entryIcon" title="{$category.category_name|@escape}{$category.category_description|@emptyPrefix}" alt="{$category.category_name|@escape}" src="{$category.category_icon}" /></a>
+            {foreach from=$entry.categories item="entry_category"}
+                {if $entry_category.category_icon}
+                    <a href="{$entry_category.category_link}"><img class="serendipity_entryIcon" title="{$entry_category.category_name|@escape}{$entry_category.category_description|@emptyPrefix}" alt="{$entry_category.category_name|@escape}" src="{$entry_category.category_icon}" /></a>
                 {/if}
             {/foreach}
             </span>
diff --git a/templates/default/entries.tpl b/templates/default/entries.tpl
index 04a1ef5..05da044 100644
--- a/templates/default/entries.tpl
+++ b/templates/default/entries.tpl
@@ -15,9 +15,9 @@
         <div class="serendipity_entry serendipity_entry_author_{$entry.author|@makeFilename} {if $entry.is_entry_owner}serendipity_entry_author_self{/if}">
             {if $entry.categories}
             <span class="serendipity_entryIcon">
-            {foreach from=$entry.categories item="category"}
-                {if $category.category_icon}
-                    <a href="{$category.category_link}"><img class="serendipity_entryIcon" title="{$category.category_name|@escape}{$category.category_description|@emptyPrefix}" alt="{$category.category_name|@escape}" src="{$category.category_icon}" /></a>
+            {foreach from=$entry.categories item="entry_category"}
+                {if $entry_category.category_icon}
+                    <a href="{$entry_category.category_link}"><img class="serendipity_entryIcon" title="{$entry_category.category_name|@escape}{$entry_category.category_description|@emptyPrefix}" alt="{$entry_category.category_name|@escape}" src="{$entry_category.category_icon}" /></a>
                 {/if}
             {/foreach}
             </span>
@@ -38,7 +38,7 @@
             <div class='serendipity_entryFooter'>
                 {$CONST.POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a>
                 {if $entry.categories}
-                   {$CONST.IN} {foreach from=$entry.categories item="category" name="categories"}<a href="{$category.category_link}">{$category.category_name|@escape}</a>{if not $smarty.foreach.categories.last}, {/if}{/foreach}
+                   {$CONST.IN} {foreach from=$entry.categories item="entry_category" name="categories"}<a href="{$entry_category.category_link}">{$entry_category.category_name|@escape}</a>{if not $smarty.foreach.categories.last}, {/if}{/foreach}
                 {/if}
 
                 {if $dategroup.is_sticky}
diff --git a/templates/kubrick/entries.tpl b/templates/kubrick/entries.tpl
index 32239e6..da13f62 100644
--- a/templates/kubrick/entries.tpl
+++ b/templates/kubrick/entries.tpl
@@ -9,9 +9,9 @@
 
             {if $entry.categories}
             <span class="categoryIcon">
-            {foreach from=$entry.categories item="category"}
-                {if $category.category_icon}
-                    <a href="{$category.category_link}"><img class="categoryIcon" title="{$category.category_name|@escape}{$category.category_description|@emptyPrefix}" alt="{$category.category_name|@escape}" src="{$category.category_icon}" /></a>
+            {foreach from=$entry.categories item="entry_category"}
+                {if $entry_category.category_icon}
+                    <a href="{$entry_category.category_link}"><img class="categoryIcon" title="{$entry_category.category_name|@escape}{$entry_category.category_description|@emptyPrefix}" alt="{$entry_category.category_name|@escape}" src="{$entry_category.category_icon}" /></a>
                 {/if}
             {/foreach}
             </span>
@@ -34,7 +34,7 @@
 
 				{$CONST.ENTRY_POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a> {$CONST.ON} {$entry.timestamp|@formatTime:DATE_FORMAT_ENTRY} {$CONST.AT} {$entry.timestamp|@formatTime:"%H:%M"}.
                 {if $entry.categories}
-                   {$CONST.FILED_UNDER} {foreach from=$entry.categories item="category" name="categories"}<a href="{$category.category_link}">{$category.category_name|@escape}</a>{if not $smarty.foreach.categories.last}, {/if}{/foreach}.
+                   {$CONST.FILED_UNDER} {foreach from=$entry.categories item="entry_category" name="categories"}<a href="{$entry_category.category_link}">{$entry_category.category_name|@escape}</a>{if not $smarty.foreach.categories.last}, {/if}{/foreach}.
                 {/if}
                 {if $entry.allow_comments}
                     {$CONST.LEAVE_RESPONSE|sprintf:'<a href="#serendipity_CommentForm">':'</a>':"<a href=\"$entry[link]\">":'</a>'}
@@ -48,7 +48,7 @@
                 {else}
                 {$CONST.POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a>
                 {if $entry.categories}
-                   {$CONST.IN} {foreach from=$entry.categories item="category" name="categories"}<a href="{$category.category_link}">{$category.category_name|@escape}</a>{if not $smarty.foreach.categories.last}, {/if}{/foreach}
+                   {$CONST.IN} {foreach from=$entry.categories item="entry_category" name="categories"}<a href="{$entry_category.category_link}">{$entry_category.category_name|@escape}</a>{if not $smarty.foreach.categories.last}, {/if}{/foreach}
                 {/if}
 
                 {if $dategroup.is_sticky}
diff --git a/templates/wp/entries.tpl b/templates/wp/entries.tpl
index cec28cc..6e1525f 100644
--- a/templates/wp/entries.tpl
+++ b/templates/wp/entries.tpl
@@ -12,8 +12,8 @@
         <h3 class="storytitle" id="post-{$entry.id}"><a href="{$entry.link}" rel="bookmark" title="Permanent Link: {$entry.title}">{$entry.title}</a></h3>
 
         <div class="meta">Filed under:
-          <ul class="post-categories">{foreach from=$entry.categories item="category"}
-            <li><a title="View all posts in {$category.category_name}" href="{$serendipityHTTPPath}{$serendipityRewritePrefix}{$CONST.PATH_CATEGORIES}/{$category.category_id}-{$category.category_name|@makeFilename}">{$category.category_name}</a></li>
+          <ul class="post-categories">{foreach from=$entry.categories item="entry_category"}
+            <li><a title="View all posts in {$entry_category.category_name}" href="{$serendipityHTTPPath}{$serendipityRewritePrefix}{$CONST.PATH_CATEGORIES}/{$entry_category.category_id}-{$entry_category.category_name|@makeFilename}">{$entry_category.category_name}</a></li>
           {/foreach}</ul>
           &#8212; {$entry.author} @ {$entry.timestamp|@formatTime:'%I:%M %p'}
         </div>