Merge branch 'stable'

[ps-cgit] / ui-patch.c

diff --git a/ui-patch.c b/ui-patch.c
index 5d665d3edbe826c01705ef7f009d045860b6e243..2a8f7a573ca8433bdc1e46dcca444202a4431d46 100644 (file)
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -108,7 +108,11 @@ void cgit_print_patch(char *hex)
        ctx.page.filename = patchname;
        cgit_print_http_headers(&ctx);
        htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1));
        ctx.page.filename = patchname;
        cgit_print_http_headers(&ctx);
        htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1));

-       htmlf("From: %s %s\n", info->author, info->author_email);
+       htmlf("From: %s", info->author);
+       if (!ctx.cfg.noplainemail) {
+               htmlf(" %s", info->author_email);
+       }
+       html("\n");

        html("Date: ");
        cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time);
        htmlf("Subject: %s\n\n", info->subject);
        html("Date: ");
        cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time);
        htmlf("Subject: %s\n\n", info->subject);