edittemplate: Make silent mode not disable display when the template page does not...

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index d6507201080da9915cf318d2bc63f811b4fac79a..742413c94583a761ec6c180735444882ae343e41 100644 (file)
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -59,8 +59,9 @@ sub preprocess (@) {
        my $bestlink=bestlink($params{page}, $link);
        $pagestate{$params{page}}{edittemplate}{$params{match}}=$bestlink;
 
        my $bestlink=bestlink($params{page}, $link);
        $pagestate{$params{page}}{edittemplate}{$params{match}}=$bestlink;
 

-       return "" if ($params{silent} && IkiWiki::yesno($params{silent}));

        add_depends($params{page}, $link, deptype("presence"));
        add_depends($params{page}, $link, deptype("presence"));

+       return "" if ($params{silent} && IkiWiki::yesno($params{silent})) &&
+               length $bestlink;

        return sprintf(gettext("edittemplate %s registered for %s"),
                htmllink($params{page}, $params{destpage}, $link),
                $params{match});
        return sprintf(gettext("edittemplate %s registered for %s"),
                htmllink($params{page}, $params{destpage}, $link),
                $params{match});

diff --git a/debian/changelog b/debian/changelog
index 1d849f55873e0c497ba0be27e0c43587a5f3557d..d607640c465e82d5645a8b5c41271c8c304c65c4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ ikiwiki (3.20100611) UNRELEASED; urgency=low
   * img: Support hspace and vspace attributes.
   * editpage: Rename "comments" field to avoid CSS conflict with the
     comments div.
   * img: Support hspace and vspace attributes.
   * editpage: Rename "comments" field to avoid CSS conflict with the
     comments div.

+  * edittemplate: Make silent mode not disable display when the template
+    page does not exist, so it can be easily created.

 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Jun 2010 13:39:15 -0400