[php-blog-cvs] serendipity/templates/default entries.tpl,1.1.2.21,1.1.2.22 plugin_calendar.tpl,1.1.2.2,1.1.2.3

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

Update of /cvsroot/php-blog/serendipity/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10650/templates/default

Modified Files:
      Tag: branch-smarty
	entries.tpl plugin_calendar.tpl 
Log Message:
* fixed entryproperties caching (cough, cough)
* fixed recent entries plugin (variable garbage)
* fixed some E_NOTICE errors to be nicer to PHP's error reporting


Index: entries.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/entries.tpl,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -d -r1.1.2.21 -r1.1.2.22
--- entries.tpl	15 Nov 2004 09:41:48 -0000	1.1.2.21
+++ entries.tpl	16 Nov 2004 15:23:44 -0000	1.1.2.22
@@ -78,27 +78,27 @@
         -->
         {$entry.plugin_display_dat}
 
-        {if $CONST.DATA_UNSUBSCRIBED}
-            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_UNSUBSCRIBED|@sprintf:$CONST.UNSUBSCRIBE_OK}</div><br />
-        {/if}
+        {if $is_single_entry and not $use_popups and not $is_preview}
+            {if $CONST.DATA_UNSUBSCRIBED}
+                <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_UNSUBSCRIBED|@sprintf:$CONST.UNSUBSCRIBE_OK}</div><br />
+            {/if}
 
-        {if $CONST.DATA_TRACKBACK_DELETED}
-            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_TRACKBACK_DELETED|@sprintf:$CONST.TRACKBACK_DELETED}</div><br />
-        {/if}
+            {if $CONST.DATA_TRACKBACK_DELETED}
+                <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_TRACKBACK_DELETED|@sprintf:$CONST.TRACKBACK_DELETED}</div><br />
+            {/if}
 
-        {if $CONST.DATA_TRACKBACK_APPROVED}
-            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_TRACKBACK_APPROVED|@sprintf:$CONST.TRACKBACK_APPROVED}</div><br />
-        {/if}
+            {if $CONST.DATA_TRACKBACK_APPROVED}
+                <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_TRACKBACK_APPROVED|@sprintf:$CONST.TRACKBACK_APPROVED}</div><br />
+            {/if}
 
-        {if $CONST.DATA_COMMENT_DELETED}
-            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_COMMENT_DELETED|@sprintf:$CONST.COMMENT_DELETED}</div><br />
-        {/if}
+            {if $CONST.DATA_COMMENT_DELETED}
+                <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_COMMENT_DELETED|@sprintf:$CONST.COMMENT_DELETED}</div><br />
+            {/if}
 
-        {if $CONST.DATA_COMMENT_APPROVED}
-            <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_COMMENT_APPROVED|@sprintf:$CONST.COMMENT_APPROVED}</div><br />
-        {/if}
+            {if $CONST.DATA_COMMENT_APPROVED}
+                <br /><div class="serendipity_center serendipity_msg_notice">{$CONST.DATA_COMMENT_APPROVED|@sprintf:$CONST.COMMENT_APPROVED}</div><br />
+            {/if}
 
-        {if $is_single_entry and not $use_popups and not $is_preview}
             <div class="serendipity_comments">
                 <br />
                 <a id="trackbacks"></a>

Index: plugin_calendar.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/plugin_calendar.tpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- plugin_calendar.tpl	12 Nov 2004 15:43:33 -0000	1.1.2.2
+++ plugin_calendar.tpl	16 Nov 2004 15:23:44 -0000	1.1.2.3
@@ -26,7 +26,7 @@
     {foreach from=$plugin_calendar_weeks item="week"}
         <tr class="serendipity_calendar">
         {foreach from=$week.days item="day"}
-            <td class="serendipity_calendarDay {$day.classes}">{if $day.properties.Active}<a href="{$day.properties.Link}">{/if}{$day.name|@default:"&nbsp;"}{if $day.properties.Active}</a>{/if}</td>
+            <td class="serendipity_calendarDay {$day.classes}">{if isset($day.properties.Active) and $day.properties.Active}<a href="{$day.properties.Link}">{/if}{$day.name|@default:"&nbsp;"}{if isset($day.properties.Active) and $day.properties.Active}</a>{/if}</td>
         {/foreach}
         </tr>
     {/foreach}