Merge branch 'master' of ssh://git.ikiwiki.info

diff --git a/doc/bugs/Not_all_comments_are_listed_by___33__map_or___33__inline.mdwn b/doc/bugs/Not_all_comments_are_listed_by___33__map_or___33__inline.mdwn
index 08953db5da4338fa2422405c7d676ccb185ca557..bfdc8d046051e0d0a4a0d0042a3e824935c4ae20 100644 (file)
--- a/doc/bugs/Not_all_comments_are_listed_by___33__map_or___33__inline.mdwn
+++ b/doc/bugs/Not_all_comments_are_listed_by___33__map_or___33__inline.mdwn
@@ -9,6 +9,16 @@ While working on our forum I was surprised to see that some of the comments were
 >> recent items » criteria:
 >> <https://tails.boum.org/forum/Security_Updates:_apt-get_Sufficient__63__/> --sajolida
 
+>>> Of course this is a moving target, so I checked out 
+>>> 4a787aecb142f346190ddaef59938799818c964b, which is from the same day
+>>> the above was written.. The comments in question appeared in
+>>> the rss feed when I ran `ikiwiki -setup ikiwiki.setup -gettime`
+>>> (after configuring the setup file to use git and rss and setting
+>>> `gitorigin_branch: ''`)
+>>>
+>>> So I suppose I'd need a testcase in a tarball to reproduce 
+>>> any problem. --[[Joey]]
+
 Then I found out that a map directive such as `!map pages="forum/* or
 comment(forum/*)"` was bringing a weird result too. The output is a map
 with quite a few broken links.
@@ -20,6 +30,9 @@ with quite a few broken links.
 >> So I don't understand why 90 % of the comments are linked well and 10 %
 >> are broken links. Why does this map behave differently for only a few comments? --sajolida
 
+>>> I checked the first 50% or so of the comments, and every one was a
+>>> broken link. --[[Joey]]
+
 Plus, some broken links in the map do match the comments missing on the RSS feed but some others do not.
 
 Unfortunately, I couldn't find an obvious pattern for this failure.

diff --git a/doc/templates/links.mdwn b/doc/templates/links.mdwn
index b7c3028cdb596bb423efb998ff29934b0b318dd2..6c66a02ec7d17200f2ffe8f6a6af61c2344ef8e3 100644 (file)
--- a/doc/templates/links.mdwn
+++ b/doc/templates/links.mdwn
@@ -11,6 +11,6 @@
 <li>[[TipJar]]</li>
 </ul>
 <a href="http://flattr.com/thing/39811/ikiwiki">
-<img src="http://api.flattr.com/button/button-compact-static-100x17.png"
+<img src="http://api.flattr.com/button/flattr-badge-large.png"
 alt="Flattr this" title="Flattr this" /></a>
 </div>