summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-08-13 05:56:01 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-08-13 05:56:01 +0000
commitbe092a67c22e98885f79936c18529f9fac5c0fe0 (patch)
tree4e16cbc5375402a3480ad47d47a96ab7f8fb7643
parent9e1c0c5586979f15d651156a3933c56bff26adca (diff)
* Fix a bug in page type determination during online editing.
-rw-r--r--IkiWiki/CGI.pm4
-rw-r--r--debian/changelog6
2 files changed, 7 insertions, 3 deletions
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index db97740f6..f1f83cfc4 100644
--- 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 0efb4f6b1..66336196f 100644
--- 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.