cgit.c: remove useless null check

[ps-cgit] / ui-tag.c

diff --git a/ui-tag.c b/ui-tag.c
index aea795879dfe595f851efe4908e8d31fb2976837..0afc663f2370e45f5b82856cbd95396c66e6aa81 100644 (file)
--- a/ui-tag.c
+++ b/ui-tag.c
@@ -1,6 +1,6 @@
 /* ui-tag.c: display a tag
  *
- * Copyright (C) 2007 Lars Hjemli
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
@@ -52,20 +52,24 @@ void cgit_print_tag(char *revname)
 
        strbuf_addf(&fullref, "refs/tags/%s", revname);
        if (get_sha1(fullref.buf, sha1)) {
-               cgit_print_error("Bad tag reference: %s", revname);
+               cgit_print_error_page(404, "Not found",
+                       "Bad tag reference: %s", revname);
                goto cleanup;
        }
        obj = parse_object(sha1);
        if (!obj) {
-               cgit_print_error("Bad object id: %s", sha1_to_hex(sha1));
+               cgit_print_error_page(500, "Internal server error",
+                       "Bad object id: %s", sha1_to_hex(sha1));
                goto cleanup;
        }
        if (obj->type == OBJ_TAG) {
                tag = lookup_tag(sha1);
                if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) {
-                       cgit_print_error("Bad tag object: %s", revname);
+                       cgit_print_error_page(500, "Internal server error",
+                               "Bad tag object: %s", revname);
                        goto cleanup;
                }
+               cgit_print_layout_start();
                html("<table class='commit-info'>\n");
                htmlf("<tr><td>tag name</td><td>");
                html_txt(revname);
@@ -77,11 +81,13 @@ void cgit_print_tag(char *revname)
                }
                if (info->tagger) {
                        html("<tr><td>tagged by</td><td>");
+                       cgit_open_filter(ctx.repo->email_filter, info->tagger_email, "tag");
                        html_txt(info->tagger);
                        if (info->tagger_email && !ctx.cfg.noplainemail) {
                                html(" ");
                                html_txt(info->tagger_email);
                        }
+                       cgit_close_filter(ctx.repo->email_filter);
                        html("</td></tr>\n");
                }
                html("<tr><td>tagged object</td><td class='sha1'>");
@@ -91,7 +97,9 @@ void cgit_print_tag(char *revname)
                        print_download_links(revname);
                html("</table>\n");
                print_tag_content(info->msg);
+               cgit_print_layout_end();
        } else {
+               cgit_print_layout_start();
                html("<table class='commit-info'>\n");
                htmlf("<tr><td>tag name</td><td>");
                html_txt(revname);
@@ -102,6 +110,7 @@ void cgit_print_tag(char *revname)
                if (ctx.repo->snapshots)
                        print_download_links(revname);
                html("</table>\n");
+               cgit_print_layout_end();
        }
 
 cleanup: