* Fix a bug in page type determination during online editing.

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index db97740f654e57e6276ed64b50a8470c37072ac8..f1f83cfc41e3c3a49215ca7ea7f8768b0c552211 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -372,9 +372,7 @@ sub cgi_editpage ($$) { #{{{
                        # favor the type of linking page
                        $type=pagetype($pagesources{$from});
                }
-               else {
-                       $type=$config{default_pageext};
-               }
+               $type=$config{default_pageext} unless defined $type;
                $file=$page.".".$type;
        }
 

diff --git a/debian/changelog b/debian/changelog
index 0efb4f6b13dc6e4b0be40ac58b1ff288da2bc23f..66336196fe707f538e0588914b37c3149fff6971 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (1.19) UNRELEASED; urgency=low
+
+  * Fix a bug in page type determination during online editing.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 13 Aug 2006 01:53:02 -0400
+
 ikiwiki (1.18) unstable; urgency=low
 
   * The last release accidentially installed ikiwiki as ikiwiki.pl, now fixed.