]> gitweb.ps.run Git - ps-cgit/commitdiff
Merge branch 'stable'
authorLars Hjemli <hjemli@gmail.com>
Tue, 8 Dec 2009 17:30:02 +0000 (18:30 +0100)
committerLars Hjemli <hjemli@gmail.com>
Tue, 8 Dec 2009 17:30:02 +0000 (18:30 +0100)
1  2 
cgit.c

diff --combined cgit.c
index a17f40d5abfb14c434dbae8811ed839b89bc555e,6bb712de0d3d6548fa34174fbb2d2cf61c5078fc..bfde9f98ccfdf1c793aa1d70e1558e90a4b5ace5
--- 1/cgit.c
--- 2/cgit.c
+++ b/cgit.c
@@@ -68,9 -68,9 +68,9 @@@ void repo_config(struct cgit_repo *repo
                repo->section = xstrdup(value);
        else if (!strcmp(name, "readme") && value != NULL) {
                if (*value == '/')
-                       ctx.repo->readme = xstrdup(value);
+                       repo->readme = xstrdup(value);
                else
-                       ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value));
+                       repo->readme = xstrdup(fmt("%s/%s", repo->path, value));
        } else if (ctx.cfg.enable_filter_overrides) {
                if (!strcmp(name, "about-filter"))
                        repo->about_filter = new_filter(value, 0);
@@@ -209,8 -209,6 +209,8 @@@ static void querystring_cb(const char *
        } else if (!strcmp(name, "p")) {
                ctx.qry.page = xstrdup(value);
        } else if (!strcmp(name, "url")) {
 +              if (*value == '/')
 +                      value++;
                ctx.qry.url = xstrdup(value);
                cgit_parse_url(value);
        } else if (!strcmp(name, "qt")) {