diff options
| -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 | 9 | ||||
| -rw-r--r-- | po/ikiwiki.pot | 38 |
4 files changed, 36 insertions, 20 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 new file mode 100644 index 000000000..0eff756de --- /dev/null +++ b/doc/bugs/creating_page_from_comment_creates_a_comment.mdwn @@ -0,0 +1,9 @@ +If a comment contains a WikiLink, for a page that doesn't exist, and the +user clicks on the edit link, and creates the page, it will itself be saved +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]] diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 236be6834..0e97038b4 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-24 17:03-0400\n" +"POT-Creation-Date: 2011-01-27 17:13-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -610,87 +610,87 @@ msgstr "" msgid "warning: Old po4a detected! Recommend upgrade to 0.35." msgstr "" -#: ../IkiWiki/Plugin/po.pm:175 +#: ../IkiWiki/Plugin/po.pm:176 #, perl-format msgid "%s is not a valid language code" msgstr "" -#: ../IkiWiki/Plugin/po.pm:187 +#: ../IkiWiki/Plugin/po.pm:188 #, perl-format msgid "" "%s is not a valid value for po_link_to, falling back to po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:192 +#: ../IkiWiki/Plugin/po.pm:193 msgid "" "po_link_to=negotiated requires usedirs to be enabled, falling back to " "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:456 +#: ../IkiWiki/Plugin/po.pm:457 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:479 +#: ../IkiWiki/Plugin/po.pm:480 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:499 +#: ../IkiWiki/Plugin/po.pm:500 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:941 +#: ../IkiWiki/Plugin/po.pm:942 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:955 +#: ../IkiWiki/Plugin/po.pm:956 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:965 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:970 +#: ../IkiWiki/Plugin/po.pm:971 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1006 +#: ../IkiWiki/Plugin/po.pm:1007 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1017 +#: ../IkiWiki/Plugin/po.pm:1018 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1096 +#: ../IkiWiki/Plugin/po.pm:1097 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1153 ../IkiWiki/Plugin/po.pm:1165 -#: ../IkiWiki/Plugin/po.pm:1204 +#: ../IkiWiki/Plugin/po.pm:1154 ../IkiWiki/Plugin/po.pm:1166 +#: ../IkiWiki/Plugin/po.pm:1205 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1163 +#: ../IkiWiki/Plugin/po.pm:1164 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1216 +#: ../IkiWiki/Plugin/po.pm:1217 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1258 +#: ../IkiWiki/Plugin/po.pm:1259 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "" |