editpage: Avoid inheriting internal page types.

diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 8f71dafa89df49a3983f0ae185114a484608c994..3d094c263196a7738295f81c8995ce365c5ce091 100644 (file)
--- 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});
                }
                        # 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);
                $file=newpagefile($page, $type);
                if (! $form->submitted) {
                        $form->field(name => "rcsinfo", value => "", force => 1);

diff --git a/debian/changelog b/debian/changelog
index dc5ca59180814d28a67ee8c6618cdf42c7279b69..246a890803eb08460a80f9337c8289a28fcda280 100644 (file)
--- 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.
 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 3bca7270d7ffb3763c265d661a91c1a108530fa7..0eff756de486b73528d84d331546c32015028dfa 100644 (file)
--- 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]] 
 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]]