diff options
| author | Joey Hess <joey@kitenet.net> | 2012-10-16 20:49:26 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-10-16 20:49:26 -0400 |
| commit | 45801c34bd324f6cb235d079d9eaed7911507bd3 (patch) | |
| tree | 93f32452c8712becec62cc2badd16946bf2b22cf | |
| parent | 68933d5dc7d425a0e0296fccaf93d52cab387811 (diff) | |
| download | ikiwiki-45801c34bd324f6cb235d079d9eaed7911507bd3.tar ikiwiki-45801c34bd324f6cb235d079d9eaed7911507bd3.tar.gz | |
recentchangesdiff: fix further breakage to the template from 3.20120725
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | templates/change.tmpl | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 3673ca8b1..0c11390ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.20121017) UNRELEASED; urgency=low + + * recentchangesdiff: fix further breakage to the template from 3.20120725 + + -- Joey Hess <joeyh@debian.org> Tue, 16 Oct 2012 20:46:26 -0400 + ikiwiki (3.20121016) unstable; urgency=low * monochrome: New theme, contributed by Jon Dowland. diff --git a/templates/change.tmpl b/templates/change.tmpl index 989315a8d..cb022220e 100644 --- a/templates/change.tmpl +++ b/templates/change.tmpl @@ -43,13 +43,15 @@ </TMPL_IF> </TMPL_LOOP> </div> -<TMPL_UNLESS HAS_DIFFURL> <TMPL_IF DIFF> +<TMPL_IF HAS_DIFFURL> +<div class="diff"> +<TMPL_ELSE> <div class="toggleable" id="diff-<TMPL_VAR REV>"> +</TMPL_IF> <pre> <TMPL_VAR DIFF> </pre> </div> </TMPL_IF> -</TMPL_UNLESS> <!-- <TMPL_VAR REV> --> |