From: Lars Hjemli <hjemli@gmail.com>
Date: Tue, 18 Aug 2009 15:21:52 +0000 (+0200)
Subject: Merge branch 'stable'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/523c133e2e5f7089a3d18ac23f2074b60991a7f0?hp=-c

Merge branch 'stable'
---

523c133e2e5f7089a3d18ac23f2074b60991a7f0
diff --combined ui-repolist.c
index 25f076f,3aedde5..6d2f93f
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@@ -23,6 -23,7 +23,7 @@@ time_t read_agefile(char *path
  
  	if (!(f = fopen(path, "r")))
  		return -1;
+ 	buf[0] = 0;
  	if (fgets(buf, sizeof(buf), f) == NULL)
  		return -1;
  	fclose(f);
@@@ -273,11 -274,6 +274,11 @@@ void cgit_print_repolist(
  
  void cgit_print_site_readme()
  {
 -	if (ctx.cfg.root_readme)
 -		html_include(ctx.cfg.root_readme);
 +	if (!ctx.cfg.root_readme)
 +		return;
 +	if (ctx.cfg.about_filter)
 +		cgit_open_filter(ctx.cfg.about_filter);
 +	html_include(ctx.cfg.root_readme);
 +	if (ctx.cfg.about_filter)
 +		cgit_close_filter(ctx.cfg.about_filter);
  }