Merge branch 'master' of ssh://git.ikiwiki.info

[git.ikiwiki.info.git] / templates / aggregatepost.tmpl

diff --git a/templates/aggregatepost.tmpl b/templates/aggregatepost.tmpl
index 8b893673323114e98a749b0b21a4a5b1afdd7da0..5a0f6e7805b299feee7b4077a58cad0af557e02b 100644 (file)
--- a/templates/aggregatepost.tmpl
+++ b/templates/aggregatepost.tmpl
@@ -1,15 +1,19 @@
 <TMPL_VAR CONTENT>
 <TMPL_VAR CONTENT>

-<TMPL_LOOP NAME="TAGS">
+<TMPL_LOOP TAGS>

 [[!tag <TMPL_VAR TAG>]]
 </TMPL_LOOP>
 [[!tag <TMPL_VAR TAG>]]
 </TMPL_LOOP>

-<TMPL_IF NAME="TITLE">
-[[!meta title="<TMPL_VAR NAME="TITLE" ESCAPE=HTML>"]]
+<TMPL_IF TITLE>
+[[!meta title="<TMPL_VAR TITLE ESCAPE=HTML>"]]

 </TMPL_IF>
 </TMPL_IF>

-<TMPL_IF NAME="PERMALINK">
-[[!meta permalink="<TMPL_VAR NAME="PERMALINK" ESCAPE=HTML>"]]
+<TMPL_IF PERMALINK>
+[[!meta permalink="<TMPL_VAR PERMALINK ESCAPE=HTML>"]]

 </TMPL_IF>
 </TMPL_IF>

-<TMPL_IF NAME="COPYRIGHT">
-[[!meta copyright="<TMPL_VAR NAME="COPYRIGHT" ESCAPE=HTML>"]]
+<TMPL_IF COPYRIGHT>
+[[!meta copyright="<TMPL_VAR COPYRIGHT ESCAPE=HTML>"]]

 </TMPL_IF>
 </TMPL_IF>

-[[!meta author="<TMPL_VAR NAME="NAME" ESCAPE=HTML>"]]
-[[!meta authorurl="<TMPL_VAR NAME="URL" ESCAPE=HTML>"]]
+<TMPL_IF AUTHOR>
+[[!meta author="<TMPL_VAR AUTHOR ESCAPE=HTML> (<TMPL_VAR NAME ESCAPE=HTML>)"]]
+<TMPL_ELSE>
+[[!meta author="<TMPL_VAR NAME ESCAPE=HTML>"]]
+</TMPL_IF>
+[[!meta authorurl="<TMPL_VAR URL ESCAPE=HTML>"]]