scan-tree: Unify gitweb.* and cgit.* settings into one config option.

[ps-cgit] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index 46cbacfa7b520f6280302cdeffbd04609b5e1a18..36c067a3cb22643c6dca3187c6f84c0a73fda53e 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -43,8 +43,10 @@ static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
        path = fmt("%s/%s", repo->path, ctx.cfg.agefile);
        if (stat(path, &s) == 0) {
                *mtime = read_agefile(path);
-               r->mtime = *mtime;
-               return 1;
+               if (*mtime) {
+                       r->mtime = *mtime;
+                       return 1;
+               }
        }
 
        path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch ?
@@ -102,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) {
-               html("&q=");
+               html("&amp;q=");
                html_url_arg(ctx.qry.search);
        }
        htmlf("'>%s</a></th>", title);
@@ -158,7 +160,7 @@ static int sort_section(const void *a, const void *b)
 
        result = cmp(r1->section, r2->section);
        if (!result) {
-               if (!strcmp(ctx.cfg.section_sort, "age")) {
+               if (!strcmp(ctx.cfg.repository_sort, "age")) {
                        // get_repo_modtime caches the value in r->mtime, so we don't
                        // have to worry about inefficiencies here.
                        if (get_repo_modtime(r1, &t) && get_repo_modtime(r2, &t))