ui: Remember to print ampersand as proper html entities.

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index 24ef8e0f89c2fb598706adba2e8be066892f6e1e..a8dda23a38836b788ddd5a82ca5af62972cbbe48 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -1,7 +1,7 @@
 /* cgit.c: cgi for the git scm
  *
  * Copyright (C) 2006 Lars Hjemli
- * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com>
+ * Copyright (C) 2010, 2012 Jason A. Donenfeld <Jason@zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
@@ -75,11 +75,11 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
        else if (!strcmp(name, "snapshots"))
                repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value);
        else if (!strcmp(name, "enable-commit-graph"))
-               repo->enable_commit_graph = ctx.cfg.enable_commit_graph * atoi(value);
+               repo->enable_commit_graph = atoi(value);
        else if (!strcmp(name, "enable-log-filecount"))
-               repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
+               repo->enable_log_filecount = atoi(value);
        else if (!strcmp(name, "enable-log-linecount"))
-               repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
+               repo->enable_log_linecount = atoi(value);
        else if (!strcmp(name, "enable-remote-branches"))
                repo->enable_remote_branches = atoi(value);
        else if (!strcmp(name, "enable-subject-links"))
@@ -233,8 +233,8 @@ void config_cb(const char *name, const char *value)
                ctx.cfg.scan_hidden_path = atoi(value);
        else if (!strcmp(name, "section-from-path"))
                ctx.cfg.section_from_path = atoi(value);
-       else if (!strcmp(name, "section-sort"))
-               ctx.cfg.section_sort = xstrdup(value);
+       else if (!strcmp(name, "repository-sort"))
+               ctx.cfg.repository_sort = xstrdup(value);
        else if (!strcmp(name, "source-filter"))
                ctx.cfg.source_filter = new_filter(value, SOURCE);
        else if (!strcmp(name, "summary-log"))
@@ -364,7 +364,7 @@ static void prepare_context(struct cgit_context *ctx)
        ctx->cfg.scan_hidden_path = 0;
        ctx->cfg.script_name = CGIT_SCRIPT_NAME;
        ctx->cfg.section = "";
-       ctx->cfg.section_sort = "name";
+       ctx->cfg.repository_sort = "name";
        ctx->cfg.summary_branches = 10;
        ctx->cfg.summary_log = 10;
        ctx->cfg.summary_tags = 10;