From: Joey Hess <joey@kitenet.net>
Date: Wed, 2 Feb 2011 01:01:26 +0000 (-0400)
Subject: editpage: Avoid inheriting internal page types.
X-Git-Tag: 3.20110225~96
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/b752e7fec4d2bdd788a70722455018245900126b

editpage: Avoid inheriting internal page types.
---

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 8f71dafa8..3d094c263 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -131,7 +131,8 @@ sub cgi_editpage ($$) {
 			# favor the type of linking page
 			$type=pagetype($pagesources{$from});
 		}
-		$type=$config{default_pageext} unless defined $type;
+		$type=$config{default_pageext}
+			if ! defined $type || $type=~/^_/; # not internal type
 		$file=newpagefile($page, $type);
 		if (! $form->submitted) {
 			$form->field(name => "rcsinfo", value => "", force => 1);
diff --git a/debian/changelog b/debian/changelog
index dc5ca5918..246a89080 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20110125) UNRELEASED; urgency=low
+
+  * editpage: Avoid inheriting internal page types.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 01 Feb 2011 21:00:57 -0400
+
 ikiwiki (3.20110124) unstable; urgency=low
 
   * comments: Fix commenting, broken by security fix.
diff --git a/doc/bugs/creating_page_from_comment_creates_a_comment.mdwn b/doc/bugs/creating_page_from_comment_creates_a_comment.mdwn
index 3bca7270d..0eff756de 100644
--- a/doc/bugs/creating_page_from_comment_creates_a_comment.mdwn
+++ b/doc/bugs/creating_page_from_comment_creates_a_comment.mdwn
@@ -5,3 +5,5 @@ as a comment, with "._comment" extension.
 This is very surprising and wrong behavior. The page editor tries to
 preserve the linking page's format type, but it shouldn't do so if the page
 is an internal page. --[[Joey]] 
+
+[[done]] --[[Joey]]