From d74374e6cf9c47451a4437538358a9a19755a523 Mon Sep 17 00:00:00 2001
From: Matthias Mees <mm@yellowled.de>
Date: Tue, 10 Feb 2015 14:39:18 +0100
Subject: [PATCH] Remove template no longer needed with Smarty 3 from 2k15

---
 templates/2k15/comments.tpl                   |  6 ++---
 templates/2k15/entries.tpl                    | 22 +++++++++----------
 templates/2k15/entries_archives.tpl           |  2 +-
 templates/2k15/entries_summary.tpl            |  4 ++--
 templates/2k15/index.tpl                      |  2 +-
 templates/2k15/plugin_calendar.tpl            |  4 ++--
 .../plugin_commentsearch_searchresults.tpl    |  4 ++--
 templates/2k15/plugin_staticpage.tpl          | 10 ++++-----
 .../2k15/plugin_staticpage_searchresults.tpl  |  4 ++--
 templates/2k15/trackbacks.tpl                 |  6 ++---
 10 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/templates/2k15/comments.tpl b/templates/2k15/comments.tpl
index 12c17ed4..4b67c473 100644
--- a/templates/2k15/comments.tpl
+++ b/templates/2k15/comments.tpl
@@ -1,7 +1,7 @@
 {foreach from=$comments item=comment name="comments"}
     <article id="c{$comment.id}" class="comment {cycle values="odd,even"}{if $comment.depth > 8} commentlevel-9{else} commentlevel-{$comment.depth}{/if}">
         <header class="clearfix">
-            <h4>{if $comment.url}<a href="{$comment.url}">{/if}{$comment.author|@default:$CONST.ANONYMOUS}{if $comment.url}</a>{/if}{if $comment.spice_twitter_name and not $comment.spice_twitter_followme} (<a href="{$comment.spice_twitter_url}"{if $comment.spice_twitter_nofollow} rel="nofollow"{/if}>@{$comment.spice_twitter_name}</a>){/if} {$CONST.ON} <time datetime="{$comment.timestamp|@serendipity_html5time}">{$comment.timestamp|@formatTime:$template_option.date_format}</time>:</h4>
+            <h4>{if $comment.url}<a href="{$comment.url}">{/if}{$comment.author|default:$CONST.ANONYMOUS}{if $comment.url}</a>{/if}{if $comment.spice_twitter_name and not $comment.spice_twitter_followme} (<a href="{$comment.spice_twitter_url}"{if $comment.spice_twitter_nofollow} rel="nofollow"{/if}>@{$comment.spice_twitter_name}</a>){/if} {$CONST.ON} <time datetime="{$comment.timestamp|serendipity_html5time}">{$comment.timestamp|formatTime:$template_option.date_format}</time>:</h4>
         {if $comment.spice_twitter_name && $comment.spice_twitter_followme}
             <div class="twitter_follow">
             {$comment.spice_twitter_followme}
@@ -23,10 +23,10 @@
             <p>{$comment.spice_article_prefix}: <a{if $comment.spice_article_nofollow} rel="nofollow"{/if} href="{$comment.spice_article_url}">{$comment.spice_article_name}</a></p>
         {/if}
             <ul class="meta">
-                <li><time>{$comment.timestamp|@formatTime:'%H:%M'}</time></li>
+                <li><time>{$comment.timestamp|formatTime:'%H:%M'}</time></li>
                 <li><a class="comment_source_trace" href="#c{$comment.id}" title="{$CONST.TWOK15_PLINK_TITLE}">{$CONST.TWOK15_PLINK_TEXT}</a></li>
             {if $entry.is_entry_owner}
-                <li><a class="comment_source_ownerlink" href="{$comment.link_delete}" title="{$CONST.COMMENT_DELETE_CONFIRM|@sprintf:$comment.id:$comment.author}">{$CONST.DELETE}</a></li>
+                <li><a class="comment_source_ownerlink" href="{$comment.link_delete}" title="{$CONST.COMMENT_DELETE_CONFIRM|sprintf:$comment.id:$comment.author}">{$CONST.DELETE}</a></li>
             {/if}
         {if $template_option.refcomments == true}
             {if $comment.parent_id != '0'}
diff --git a/templates/2k15/entries.tpl b/templates/2k15/entries.tpl
index 71dc5f8e..ff32ba06 100644
--- a/templates/2k15/entries.tpl
+++ b/templates/2k15/entries.tpl
@@ -6,14 +6,14 @@
         <header>
             <h2 class="post-title"><a href="{$entry.link}">{$entry.title}</a></h2>
 
-            <span class="post-info">{$CONST.POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a> {$CONST.ON} <time datetime="{$entry.timestamp|@serendipity_html5time}">{$entry.timestamp|@formatTime:$template_option.date_format}</time></span>
+            <span class="post-info">{$CONST.POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a> {$CONST.ON} <time datetime="{$entry.timestamp|serendipity_html5time}">{$entry.timestamp|formatTime:$template_option.date_format}</time></span>
         </header>
 
         <div class="clearfix">
         {$entry.body}
         </div>
         {if $entry.has_extended and not $is_single_entry and not $entry.is_extended}
-        <a class="read-more" href="{$entry.link}#extended">{$CONST.VIEW_EXTENDED_ENTRY|@sprintf:$entry.title}</a>
+        <a class="read-more" href="{$entry.link}#extended">{$CONST.VIEW_EXTENDED_ENTRY|sprintf:$entry.title}</a>
         {/if}
         {if $entry.is_extended}
         <div id="extended" class="clearfix">
@@ -24,7 +24,7 @@
         <footer class="post-info">
             <ul class="meta">
             {if $entry.categories}
-                <li><span class="info-label">{$CONST.CATEGORIES}: </span>{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}</li>
+                <li><span class="info-label">{$CONST.CATEGORIES}: </span>{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}</li>
             {/if}
             {if $entry.has_comments}
                 <li><a href="{$entry.link}#comments" title="{$entry.comments} {$entry.label_comments}{if $entry.has_trackbacks}, {$entry.trackbacks} {$entry.label_trackbacks}{/if}">{$entry.comments} {$entry.label_comments}</a></li>
@@ -40,32 +40,32 @@
         <rdf:Description
                  rdf:about="{$entry.link_rdf}"
                  trackback:ping="{$entry.link_trackback}"
-                 dc:title="{$entry.title_rdf|@default:$entry.title}"
+                 dc:title="{$entry.title_rdf|default:$entry.title}"
                  dc:identifier="{$entry.rdf_ident}" />
         </rdf:RDF>
         -->
 {if $is_single_entry and not $use_popups and not $is_preview}
     {if $CONST.DATA_UNSUBSCRIBED}
-        <p class="msg-success"><span class="icon-ok-circled" aria-hidden="true"></span> {$CONST.DATA_UNSUBSCRIBED|@sprintf:$CONST.UNSUBSCRIBE_OK}</p>
+        <p class="msg-success"><span class="icon-ok-circled" aria-hidden="true"></span> {$CONST.DATA_UNSUBSCRIBED|sprintf:$CONST.UNSUBSCRIBE_OK}</p>
     {/if}
     {if $CONST.DATA_TRACKBACK_DELETED}
-        <p class="msg-success"><span class="icon-ok-circled" aria-hidden="true"></span> {$CONST.DATA_TRACKBACK_DELETED|@sprintf:$CONST.TRACKBACK_DELETED}</p>
+        <p class="msg-success"><span class="icon-ok-circled" aria-hidden="true"></span> {$CONST.DATA_TRACKBACK_DELETED|sprintf:$CONST.TRACKBACK_DELETED}</p>
     {/if}
     {if $CONST.DATA_TRACKBACK_APPROVED}
-        <p class="msg-success"><span class="icon-ok-circled" aria-hidden="true"></span> {$CONST.DATA_TRACKBACK_APPROVED|@sprintf:$CONST.TRACKBACK_APPROVED}</p>
+        <p class="msg-success"><span class="icon-ok-circled" aria-hidden="true"></span> {$CONST.DATA_TRACKBACK_APPROVED|sprintf:$CONST.TRACKBACK_APPROVED}</p>
     {/if}
     {if $CONST.DATA_COMMENT_DELETED}
-        <p class="msg-success"><span class="icon-ok-circled" aria-hidden="true"></span> {$CONST.DATA_COMMENT_DELETED|@sprintf:$CONST.COMMENT_DELETED}</p>
+        <p class="msg-success"><span class="icon-ok-circled" aria-hidden="true"></span> {$CONST.DATA_COMMENT_DELETED|sprintf:$CONST.COMMENT_DELETED}</p>
     {/if}
     {if $CONST.DATA_COMMENT_APPROVED}
-        <p class="msg-success"><span class="icon-ok-circled" aria-hidden="true"></span> {$CONST.DATA_COMMENT_APPROVED|@sprintf:$CONST.COMMENT_APPROVED}</p>
+        <p class="msg-success"><span class="icon-ok-circled" aria-hidden="true"></span> {$CONST.DATA_COMMENT_APPROVED|sprintf:$CONST.COMMENT_APPROVED}</p>
     {/if}
     <section id="trackbacks" class="clearfix">
         <h3>{$CONST.TRACKBACKS}</h3>
 
-        <a class="trackback-url" rel="nofollow" href="{$entry.link_trackback}" title="{$CONST.TRACKBACK_SPECIFIC_ON_CLICK|@escape}">{$CONST.TRACKBACK_SPECIFIC}</a>
+        <a class="trackback-url" rel="nofollow" href="{$entry.link_trackback}" title="{$CONST.TRACKBACK_SPECIFIC_ON_CLICK|escape}">{$CONST.TRACKBACK_SPECIFIC}</a>
 
-        <p class="msg-notice trackback-hint"><span class="icon-info-circled" aria-hidden="true"></span> {$CONST.TRACKBACK_SPECIFIC_ON_CLICK|@escape:html}</p>
+        <p class="msg-notice trackback-hint"><span class="icon-info-circled" aria-hidden="true"></span> {$CONST.TRACKBACK_SPECIFIC_ON_CLICK|escape:html}</p>
 
         {serendipity_printTrackbacks entry=$entry.id}
     </section>
diff --git a/templates/2k15/entries_archives.tpl b/templates/2k15/entries_archives.tpl
index 6ae5bc19..b865f78d 100644
--- a/templates/2k15/entries_archives.tpl
+++ b/templates/2k15/entries_archives.tpl
@@ -9,7 +9,7 @@
         <ul class="year">
         {foreach from=$archive.months item="month"}
             <li class="month">
-                <span class="date">{if $month.entry_count}<a href="{$month.link}" title="{$CONST.VIEW_FULL}">{/if}{$month.date|@formatTime:"%B"}{if $month.entry_count}</a>{/if}:</span>
+                <span class="date">{if $month.entry_count}<a href="{$month.link}" title="{$CONST.VIEW_FULL}">{/if}{$month.date|formatTime:"%B"}{if $month.entry_count}</a>{/if}:</span>
                 <span class="count">{if $month.entry_count}<a href="{$month.link_summary}" title="{$CONST.VIEW_TOPICS}">{/if}{$month.entry_count} {$CONST.ENTRIES}{if $month.entry_count}</a>{/if}</span>
             </li>
         {/foreach}
diff --git a/templates/2k15/entries_summary.tpl b/templates/2k15/entries_summary.tpl
index 10cffe9b..c9618b40 100644
--- a/templates/2k15/entries_summary.tpl
+++ b/templates/2k15/entries_summary.tpl
@@ -1,12 +1,12 @@
 {serendipity_hookPlugin hook="entries_header"}
 <article id="archives" class="clearfix">
-	<h2>{$CONST.TOPICS_OF} {$dateRange.0|@formatTime:"%B %Y"}</h2>
+	<h2>{$CONST.TOPICS_OF} {$dateRange.0|formatTime:"%B %Y"}</h2>
 
 	<ul class="summary">
 	{foreach from=$entries item="sentries"}
         {foreach from=$sentries.entries item="entry"}
         <li><a href="{$entry.link}">{$entry.title}</a>
-            <span>{$CONST.POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a> {$CONST.ON} <time datetime="{$entry.timestamp|@serendipity_html5time}">{$entry.timestamp|@formatTime:$template_option.date_format}</time></span>
+            <span>{$CONST.POSTED_BY} <a href="{$entry.link_author}">{$entry.author}</a> {$CONST.ON} <time datetime="{$entry.timestamp|serendipity_html5time}">{$entry.timestamp|formatTime:$template_option.date_format}</time></span>
         </li>
         {/foreach}
     {/foreach}
diff --git a/templates/2k15/index.tpl b/templates/2k15/index.tpl
index 1cb9226d..a8e39c93 100644
--- a/templates/2k15/index.tpl
+++ b/templates/2k15/index.tpl
@@ -4,7 +4,7 @@
 <!--[if gt IE 8]><!--> <html class="no-js" lang="{$lang}"> <!--<![endif]-->
 <head>
     <meta charset="{$head_charset}">
-    <title>{$head_title|@default:$blogTitle}{if $head_subtitle} | {$head_subtitle}{/if}</title>
+    <title>{$head_title|default:$blogTitle}{if $head_subtitle} | {$head_subtitle}{/if}</title>
     <meta name="generator" content="Serendipity v.{$head_version}">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="dns-prefetch" href="//ajax.googleapis.com">
diff --git a/templates/2k15/plugin_calendar.tpl b/templates/2k15/plugin_calendar.tpl
index 3ec29d18..e2b09771 100644
--- a/templates/2k15/plugin_calendar.tpl
+++ b/templates/2k15/plugin_calendar.tpl
@@ -2,7 +2,7 @@
 <thead>
     <tr>
     {foreach from=$plugin_calendar_dow item="dow"}
-        <th scope="col"><abbr title="{$dow.date|@formatTime:"%A":false}">{$dow.date|@formatTime:"%a":false}</abbr></th>
+        <th scope="col"><abbr title="{$dow.date|formatTime:"%A":false}">{$dow.date|formatTime:"%a":false}</abbr></th>
     {/foreach}
     </tr>
 </thead>
@@ -27,7 +27,7 @@
 {foreach from=$plugin_calendar_weeks item="week"}
     <tr>
     {foreach from=$week.days item="day"}
-        <td class="{$day.classes}"{if isset($day.properties.Title)} title="{$day.properties.Title}"{/if}>{if isset($day.properties.Active) and $day.properties.Active}<a href="{$day.properties.Link}">{/if}{$day.name|@default:"&#160;"}{if isset($day.properties.Active) and $day.properties.Active}</a>{/if}</td>
+        <td class="{$day.classes}"{if isset($day.properties.Title)} title="{$day.properties.Title}"{/if}>{if isset($day.properties.Active) and $day.properties.Active}<a href="{$day.properties.Link}">{/if}{$day.name|default:"&#160;"}{if isset($day.properties.Active) and $day.properties.Active}</a>{/if}</td>
     {/foreach}
     </tr>
 {/foreach}
diff --git a/templates/2k15/plugin_commentsearch_searchresults.tpl b/templates/2k15/plugin_commentsearch_searchresults.tpl
index c060ed62..916bbbb6 100644
--- a/templates/2k15/plugin_commentsearch_searchresults.tpl
+++ b/templates/2k15/plugin_commentsearch_searchresults.tpl
@@ -3,8 +3,8 @@
     {if $comment_results}
     <ul>
     {foreach from=$comment_results item="result"}
-        <li><span>{if $result.type == 'TRACKBACK'}<a href="{$result.url|escape}">{else}<b>{/if}{$result.author|escape}{if $result.type == 'TRACKBACK'}</a>{else}</b>{/if} {$CONST.IN} <a href="{$result.permalink|escape}">{$result.title|escape}</a> {$CONST.ON} <time datetime="{$result.ctimestamp|@serendipity_html5time}">{$result.ctimestamp|@formatTime:$template_option.date_format}</time>:</span>
-        {$result.comment|@strip_tags|@truncate:200:" ... "}</li>
+        <li><span>{if $result.type == 'TRACKBACK'}<a href="{$result.url|escape}">{else}<b>{/if}{$result.author|escape}{if $result.type == 'TRACKBACK'}</a>{else}</b>{/if} {$CONST.IN} <a href="{$result.permalink|escape}">{$result.title|escape}</a> {$CONST.ON} <time datetime="{$result.ctimestamp|serendipity_html5time}">{$result.ctimestamp|formatTime:$template_option.date_format}</time>:</span>
+        {$result.comment|strip_tags|truncate:200:" ... "}</li>
     {/foreach}
     </ul>
     {else}
diff --git a/templates/2k15/plugin_staticpage.tpl b/templates/2k15/plugin_staticpage.tpl
index 8f0f0d5d..50d1cad5 100644
--- a/templates/2k15/plugin_staticpage.tpl
+++ b/templates/2k15/plugin_staticpage.tpl
@@ -1,9 +1,9 @@
-<article id="page-{$staticpage_pagetitle|@makeFilename}" class="post clearfix">
-    <h2 class="post-title">{if $staticpage_articleformat}{if $staticpage_articleformattitle}{$staticpage_articleformattitle|@escape}{else}{$staticpage_pagetitle}{/if}{else}{if $staticpage_headline}{$staticpage_headline|@escape}{else}{$staticpage_pagetitle}{/if}{/if}</h2>
+<article id="page-{$staticpage_pagetitle|makeFilename}" class="post clearfix">
+    <h2 class="post-title">{if $staticpage_articleformat}{if $staticpage_articleformattitle}{$staticpage_articleformattitle|escape}{else}{$staticpage_pagetitle}{/if}{else}{if $staticpage_headline}{$staticpage_headline|escape}{else}{$staticpage_pagetitle}{/if}{/if}</h2>
 {if is_array($staticpage_childpages)}
     <ul id="child-pages">
     {foreach from=$staticpage_childpages item="childpage"}
-        <li><a href="{$childpage.permalink|@escape}" title="{$childpage.pagetitle|@escape}">{$childpage.pagetitle|@escape}</a></li>
+        <li><a href="{$childpage.permalink|escape}" title="{$childpage.pagetitle|escape}">{$childpage.pagetitle|escape}</a></li>
     {/foreach}
     </ul>
 {/if}
@@ -27,10 +27,10 @@
     <footer class="page-info post-info">
         <ul class="meta">
         {if $staticpage_author}
-            <li>{$CONST.POSTED_BY} {$staticpage_author|@escape}</li>
+            <li>{$CONST.POSTED_BY} {$staticpage_author|escape}</li>
         {/if}
         {if $staticpage_lastchange}
-            <li>{$CONST.ON} <time datetime="{$staticpage_lastchange|@serendipity_html5time}">{$staticpage_lastchange|date_format:$template_option.date_format}</time></li>
+            <li>{$CONST.ON} <time datetime="{$staticpage_lastchange|serendipity_html5time}">{$staticpage_lastchange|date_format:$template_option.date_format}</time></li>
         {/if}
         </ul>
     </footer>
diff --git a/templates/2k15/plugin_staticpage_searchresults.tpl b/templates/2k15/plugin_staticpage_searchresults.tpl
index f5b6a90a..cdb2e744 100644
--- a/templates/2k15/plugin_staticpage_searchresults.tpl
+++ b/templates/2k15/plugin_staticpage_searchresults.tpl
@@ -3,8 +3,8 @@
     {if $staticpage_results}
     <ul>
     {foreach from=$staticpage_results item="result"}
-        <li><span><a href="{$result.permalink|@escape}" title="{$result.pagetitle|@escape}">{$result.headline}</a> ({$result.realname})</span>
-            {$result.content|@strip_tags|@strip|@truncate:200:" ... "}</li>
+        <li><span><a href="{$result.permalink|escape}" title="{$result.pagetitle|escape}">{$result.headline}</a> ({$result.realname})</span>
+            {$result.content|strip_tags|strip|truncate:200:" ... "}</li>
     {/foreach}
     </ul>
     {else}
diff --git a/templates/2k15/trackbacks.tpl b/templates/2k15/trackbacks.tpl
index bd857d69..d9caa1a3 100644
--- a/templates/2k15/trackbacks.tpl
+++ b/templates/2k15/trackbacks.tpl
@@ -1,13 +1,13 @@
 {foreach from=$trackbacks item=trackback}
     <article id="c{$trackback.id}" class="trackback">
-        <h4><cite>{$trackback.author|@default:$CONST.ANONYMOUS}</cite> {$CONST.ON} <time datetime="{$trackback.timestamp|@serendipity_html5time}">{$trackback.timestamp|@formatTime:$template_option.date_format}</time>: <a href="{$trackback.url|@strip_tags}">{$trackback.title}</a></h4>
+        <h4><cite>{$trackback.author|default:$CONST.ANONYMOUS}</cite> {$CONST.ON} <time datetime="{$trackback.timestamp|serendipity_html5time}">{$trackback.timestamp|formatTime:$template_option.date_format}</time>: <a href="{$trackback.url|strip_tags}">{$trackback.title}</a></h4>
 	{if $trackback.body == ''}
 		<p class="msg-notice no-content"><span class="icon-info-circled" aria-hidden="true"></span> {$CONST.NO_ENTRIES_TO_PRINT}</p>
 	{else}
         <details>
-            <summary>{$CONST.VIEW_EXTENDED_ENTRY|@sprintf:$trackback.title}</summary>
+            <summary>{$CONST.VIEW_EXTENDED_ENTRY|sprintf:$trackback.title}</summary>
             <div class="clearfix">
-            {$trackback.body|@strip_tags|@escape:all}
+            {$trackback.body|strip_tags|escape:'htmlall'}
             </div>
         </details>
     {/if}