diff options
| author | Joey Hess <joey@kitenet.net> | 2011-02-01 21:01:26 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-02-01 21:01:26 -0400 |
| commit | b752e7fec4d2bdd788a70722455018245900126b (patch) | |
| tree | 89311c1ef640e71b2e252bbfa77049a10f8a88b6 | |
| parent | 07ec1372387b8c6fd8f3d8c6c0fdf10aabc9a706 (diff) | |
| download | ikiwiki-b752e7fec4d2bdd788a70722455018245900126b.tar ikiwiki-b752e7fec4d2bdd788a70722455018245900126b.tar.gz | |
editpage: Avoid inheriting internal page types.
| -rw-r--r-- | IkiWiki/Plugin/editpage.pm | 3 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | doc/bugs/creating_page_from_comment_creates_a_comment.mdwn | 2 |
3 files changed, 10 insertions, 1 deletions
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]] |