ui: Remember to print ampersand as proper html entities.

diff --git a/ui-repolist.c b/ui-repolist.c
index c774632622fcaccf9cb62364d3888bbf1c544b1f..36c067a3cb22643c6dca3187c6f84c0a73fda53e 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -104,7 +104,7 @@ void print_sort_header(const char *title, const char *sort)
 {
        htmlf("<th class='left'><a href='%s?s=%s", cgit_rooturl(), sort);
        if (ctx.qry.search) {
 {
        htmlf("<th class='left'><a href='%s?s=%s", cgit_rooturl(), sort);
        if (ctx.qry.search) {

-               html("&q=");
+               html("&amp;q=");

                html_url_arg(ctx.qry.search);
        }
        htmlf("'>%s</a></th>", title);
                html_url_arg(ctx.qry.search);
        }
        htmlf("'>%s</a></th>", title);

diff --git a/ui-shared.c b/ui-shared.c
index 43166af4d568125306ff3f88d2f6f97c54d2405e..d9d5da74ac14ddb2e01772571e461dfae36c0844 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -83,7 +83,7 @@ char *cgit_fileurl(const char *reponame, const char *pagename,
        } else {
                tmp = fmt("?url=%s/%s/%s", reponame, pagename,
                          (filename ? filename : ""));
        } else {
                tmp = fmt("?url=%s/%s/%s", reponame, pagename,
                          (filename ? filename : ""));

-               delim = "&";
+               delim = "&";

        }
        if (query)
                tmp = fmt("%s%s%s", tmp, delim, query);
        }
        if (query)
                tmp = fmt("%s%s%s", tmp, delim, query);


@@ -146,19 +146,19 @@ static void site_url(const char *page, const char *search, const char *sort, int
 
        if (page) {
                htmlf("?p=%s", page);
 
        if (page) {
                htmlf("?p=%s", page);

-               delim = "&";
+               delim = "&";

        }
        if (search) {
                html(delim);
                html("q=");
                html_attr(search);
        }
        if (search) {
                html(delim);
                html("q=");
                html_attr(search);

-               delim = "&";
+               delim = "&";

        }
        if (sort) {
                html(delim);
                html("s=");
                html_attr(sort);
        }
        if (sort) {
                html(delim);
                html("s=");
                html_attr(sort);

-               delim = "&";
+               delim = "&";

        }
        if (ofs) {
                html(delim);
        }
        if (ofs) {
                html(delim);


@@ -298,13 +298,13 @@ void cgit_log_link(const char *name, const char *title, const char *class,
                html(delim);
                html("id=");
                html_url_arg(rev);
                html(delim);
                html("id=");
                html_url_arg(rev);

-               delim = "&";
+               delim = "&";

        }
        if (grep && pattern) {
                html(delim);
                html("qt=");
                html_url_arg(grep);
        }
        if (grep && pattern) {
                html(delim);
                html("qt=");
                html_url_arg(grep);

-               delim = "&";
+               delim = "&";

                html(delim);
                html("q=");
                html_url_arg(pattern);
                html(delim);
                html("q=");
                html_url_arg(pattern);


@@ -313,7 +313,7 @@ void cgit_log_link(const char *name, const char *title, const char *class,
                html(delim);
                html("ofs=");
                htmlf("%d", ofs);
                html(delim);
                html("ofs=");
                htmlf("%d", ofs);

-               delim = "&";
+               delim = "&";

        }
        if (showmsg) {
                html(delim);
        }
        if (showmsg) {
                html(delim);