Merge branch 'stable'

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 7f38d2acb41dc9fe451c3ba9f133eb81794b71d9..41b5225616933bcc7ab80a155ef0f7ba6c65b4cd 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -112,7 +112,7 @@ void print_commit(struct commit *commit)
        html("</td></tr>\n");
        if (ctx.qry.showmsg) {
                struct strbuf notes = STRBUF_INIT;
        html("</td></tr>\n");
        if (ctx.qry.showmsg) {
                struct strbuf notes = STRBUF_INIT;

-               get_commit_notes(commit, &notes, PAGE_ENCODING, 0);
+               format_note(NULL, commit->object.sha1, &notes, PAGE_ENCODING, 0);

 
                if (ctx.repo->enable_log_filecount) {
                        cols++;
 
                if (ctx.repo->enable_log_filecount) {
                        cols++;


@@ -228,8 +228,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                commit->parents = NULL;
        }
        if (pager) {
                commit->parents = NULL;
        }
        if (pager) {

-               htmlf("</table><div class='pager'>",
-                    columns);
+               html("</table><div class='pager'>");

                if (ofs > 0) {
                        cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
                                      ctx.qry.sha1, ctx.qry.vpath,
                if (ofs > 0) {
                        cgit_log_link("[prev]", NULL, NULL, ctx.qry.head,
                                      ctx.qry.sha1, ctx.qry.vpath,