Deal with empty diffurl in configuration.

diff --git a/IkiWiki/Plugin/recentchanges.pm b/IkiWiki/Plugin/recentchanges.pm
index 4c186325562cad93869ea4b0fe49ab305dcdf2cc..eec9803be1397dc0a473b5c4287a0b8cdfa25ac7 100644 (file)
--- a/IkiWiki/Plugin/recentchanges.pm
+++ b/IkiWiki/Plugin/recentchanges.pm
@@ -181,7 +181,7 @@ sub store ($$$) {
                        else {
                                $_->{link} = pagetitle($_->{page});
                        }
                        else {
                                $_->{link} = pagetitle($_->{page});
                        }

-                       if (defined $_->{diffurl}) {
+                       if (defined $_->{diffurl} && length($_->{diffurl})) {

                                $has_diffurl=1;
                        }
 
                                $has_diffurl=1;
                        }
 

diff --git a/debian/changelog b/debian/changelog
index d1d132e1efe5fb40e70d3c32e3dfe00ce49fe27f..44bf981124881340f6afe5baa423968945efd330 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ ikiwiki (3.20121213) UNRELEASED; urgency=low
     a poll.
   * trail: Avoid massive slowdown caused by pagetemplate hook when displaying
     dynamic cgi pages, which cannot use trail anyway.
     a poll.
   * trail: Avoid massive slowdown caused by pagetemplate hook when displaying
     dynamic cgi pages, which cannot use trail anyway.

+  * Deal with empty diffurl in configuration.

 
  -- Joey Hess <joeyh@debian.org>  Sat, 22 Dec 2012 16:15:24 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Sat, 22 Dec 2012 16:15:24 -0400
 

diff --git a/doc/bugs/recentchanges_sets_has__95__diffurl__61__1_when_diffurl_is_empty.mdwn b/doc/bugs/recentchanges_sets_has__95__diffurl__61__1_when_diffurl_is_empty.mdwn
index d0297bb3e744e716b4f80797a1902c5bd2b99a3d..6c6e24b021df83e034a8199553ab234770e37dd4 100644 (file)
--- a/doc/bugs/recentchanges_sets_has__95__diffurl__61__1_when_diffurl_is_empty.mdwn
+++ b/doc/bugs/recentchanges_sets_has__95__diffurl__61__1_when_diffurl_is_empty.mdwn
@@ -14,3 +14,5 @@ recentchanges.pm sets the template variable HAS_DIFFURL to 1 based solely on whe
      
 
 (There should be one more line at the bottom with a single space on it...)
      
 
 (There should be one more line at the bottom with a single space on it...)

+
+> [[applied|done]] --[[Joey]]