diff options
author | Jonas Smedegaard <dr@jones.dk> | 2008-08-01 22:00:20 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-01 22:00:20 +0200 |
commit | 18a148e567f54d6b11b54e403b359abe0d878eca (patch) | |
tree | 0cdc6d744f24b06febadc52617e9bedb92a5931b /atomitem.tmpl | |
parent | 90f21c9df7116875db9459b3a835f8bb0d9d96e3 (diff) | |
parent | 4fb9600af4d836e61a341531507380465b715226 (diff) |
Merge branch 'master-da' into scs-da
Conflicts (merged manually):
page.tmpl
Diffstat (limited to 'atomitem.tmpl')
-rw-r--r-- | atomitem.tmpl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/atomitem.tmpl b/atomitem.tmpl index 4c128a5..146b9aa 100644 --- a/atomitem.tmpl +++ b/atomitem.tmpl @@ -1,6 +1,10 @@ <entry> <title><TMPL_VAR TITLE></title> - <id><TMPL_VAR URL></id> + <TMPL_IF NAME="GUID"> + <id><TMPL_VAR GUID></id> + <TMPL_ELSE> + <id><TMPL_VAR URL></id> + </TMPL_IF> <link href="<TMPL_VAR PERMALINK>"/> <TMPL_IF NAME="AUTHOR"> <author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author> |