Merge branch 'stable'

[ps-cgit] / ui-atom.c

diff --git a/ui-atom.c b/ui-atom.c
index e5c31d9dd066fd7e7a63da846ab6add0b9aea0e6..5c854c77b700c823798797d8476c2fe7f46b9daf 100644 (file)
--- a/ui-atom.c
+++ b/ui-atom.c
@@ -24,7 +24,7 @@ void add_entry(struct commit *commit, char *host)
        html_txt(info->subject);
        html("</title>\n");
        html("<updated>");
-       cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time);
+       cgit_print_date(info->author_date, FMT_ATOMDATE, 0);
        html("</updated>\n");
        html("<author>\n");
        if (info->author) {
@@ -32,7 +32,7 @@ void add_entry(struct commit *commit, char *host)
                html_txt(info->author);
                html("</name>\n");
        }
-       if (info->author_email) {
+       if (info->author_email && !ctx.cfg.noplainemail) {
                mail = xstrdup(info->author_email);
                t = strchr(mail, '<');
                if (t)
@@ -49,7 +49,7 @@ void add_entry(struct commit *commit, char *host)
        }
        html("</author>\n");
        html("<published>");
-       cgit_print_date(info->author_date, FMT_ATOMDATE, ctx.cfg.local_time);
+       cgit_print_date(info->author_date, FMT_ATOMDATE, 0);
        html("</published>\n");
        if (host) {
                html("<link rel='alternate' type='text/html' href='");
@@ -85,7 +85,9 @@ void cgit_print_atom(char *tip, char *path, int max_count)
        struct rev_info rev;
        int argc = 2;
 
-       if (!tip)
+       if (ctx.qry.show_all)
+               argv[1] = "--all";
+       else if (!tip)
                argv[1] = ctx.qry.head;
 
        if (path) {