diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-10-14 13:23:22 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-10-14 13:23:22 +0200 |
| commit | 72e64684948b6ba0e89759fbf74358ce5f112a59 (patch) | |
| tree | fa5ec77e53ba062015a5cbf79213edf61919ac7f | |
| parent | 5df058b2b3dc6e565ad3b3604263f487ef65f2af (diff) | |
Sync with ikiwiki 3.20100926.
| -rw-r--r-- | page.tmpl | 3 | ||||
| -rw-r--r-- | rssitem.tmpl | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -11,7 +11,6 @@ </TMPL_IF> </TMPL_IF> <TMPL_IF HTML5><meta charset="utf-8" /><TMPL_ELSE><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></TMPL_IF> -<meta http-equiv="Cache-Control" content="must-revalidate" /> <title><TMPL_VAR TITLE></title> <TMPL_IF FAVICON> <link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" /> @@ -118,6 +117,7 @@ <TMPL_VAR CONTENT> <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> +<TMPL_UNLESS DYNAMIC> <TMPL_IF COMMENTS> <TMPL_IF HTML5><section id="comments"><TMPL_ELSE><div id="comments"></TMPL_IF> <TMPL_VAR COMMENTS> @@ -130,6 +130,7 @@ </TMPL_IF> <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> </TMPL_IF> +</TMPL_UNLESS> </div> diff --git a/rssitem.tmpl b/rssitem.tmpl index a64a4eb..272b340 100644 --- a/rssitem.tmpl +++ b/rssitem.tmpl @@ -8,7 +8,7 @@ <TMPL_IF GUID> <guid isPermaLink="no"><TMPL_VAR GUID></guid> <TMPL_ELSE> - <guid><TMPL_VAR URL></guid> + <guid isPermaLink="no"><TMPL_VAR URL></guid> </TMPL_IF> <link><TMPL_VAR PERMALINK></link> <TMPL_IF CATEGORIES> |