diff options
| author | Matthias Andreas Benkard <code@mail.matthias.benkard.de> | 2011-03-15 21:30:20 +0100 |
|---|---|---|
| committer | Matthias Andreas Benkard <code@mail.matthias.benkard.de> | 2011-03-15 21:30:20 +0100 |
| commit | 1ff15e41e0c8c6244400329ca9d5b6bfaca0d202 (patch) | |
| tree | 1e3fe9aa8a23db0ec358366be591a1c2c1a2c0a2 | |
| parent | aec5f0527fcb174c885b55ca8a518ff60269d2fc (diff) | |
Fix feed problems.
| -rw-r--r-- | mulkcms.lisp | 34 | ||||
| -rw-r--r-- | templates/article_feed.xml | 4 |
2 files changed, 27 insertions, 11 deletions
diff --git a/mulkcms.lisp b/mulkcms.lisp index 0861a43..b6d5e61 100644 --- a/mulkcms.lisp +++ b/mulkcms.lisp @@ -204,7 +204,9 @@ :article-id article :global-id global-id :status status - :link (link-to :view :article-id article) + :link (link-to :view + :article-id article + :absolute t) :commentary (if commentary-p (list :comments comments) nil) :comment-submission (when commentary-p (list :fields (list (list :field-id "name" @@ -236,16 +238,22 @@ Akismet) other than the site owner." "")) - :action (link-to :post-comment :article-id article))) + :action (link-to :post-comment + :article-id article + :absolute t))) :edit-link (link-to :edit :article-id article) :edit-button-label "Edit" - :comment-feed (link-to :view-comment-feed :article-id article) + :comment-feed (link-to :view-comment-feed + :article-id article + :absolute t) :comment-feed-label "Comment feed" :comments-label (case comment-num (0 "no comments") (1 "1 comment") (otherwise (format nil "~D comments" comment-num))) - :comments-link (link-to :view-comments :article-id article) + :comments-link (link-to :view-comments + :article-id article + :absolute t) :comments-heading "Comments"))) (defun format-comment-content (text) @@ -400,7 +408,10 @@ :author-link (if (and author-website (not (equal author-website ""))) author-website nil) - :link (link-to :view :article-id article :comment-id comment) + :link (link-to :view + :article-id article + :comment-id comment + :absolute t) :edit-link "" :edit-button-label "Edit" :generic-commenter-name "Someone"))))) @@ -480,7 +491,7 @@ FROM users JOIN article_revisions ON author = users.id" - :plist)) + :plists)) (last-updated (query "SELECT max(date) FROM article_revisions @@ -493,7 +504,7 @@ :subtitle "" :global-id *feed-global-id* :authors authors - :feed-uri (link-to :view-atom-feed) + :feed-uri (link-to :view-atom-feed :absolute t) :articles revisions))) (expand-template (template "article_feed") template-params)))))))))) @@ -639,7 +650,10 @@ (list :id id :title title :date date - :link (link-to :edit :article-id article-id :revision-id id) + :link (link-to :edit + :article-id article-id + :revision-id id + :absolute t) :characteristics (parse-array characteristics)))) (paramify-article-row (row) (destructuring-bind (id revisions aliases) @@ -774,7 +788,9 @@ :root *base-uri* :site-name *site-name* :site-subtitle "" - :link (link-to :edit :article-id article) + :link (link-to :edit + :article-id article + :absolute t) :save-button-label "Save" :publish-flag-label "Publish" :title-label "Title" diff --git a/templates/article_feed.xml b/templates/article_feed.xml index b284f45..add9e17 100644 --- a/templates/article_feed.xml +++ b/templates/article_feed.xml @@ -6,11 +6,11 @@ <subtitle> {subtitle} </subtitle> + {.repeated section authors} <author> - {.repeated section authors} <name>{name}</name> - {.end} </author> + {.end} <link rel="alternate" type="text/html" href="{base-uri|html-attr-value}"/> <link rel="self" type="application/atom+xml" href="{feed-uri|html-attr-value}"/> {.repeated section articles} |