From 9741a3f979eb65b59b32f04422410e206f48ed86 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 25 Dec 2010 13:32:57 -0400 Subject: [PATCH] inline: Force an absolute page location when the inline postform is used. There seems no need to allow selecting a location when creating a page this way; the user should always want it to appear in the inline whose form they submitted. --- IkiWiki/Plugin/inline.pm | 2 +- debian/changelog | 1 + ...om_edittemplate__39__s_match__61____34____34___pagespec.mdwn | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index e8e71e552..7c5da7343 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -128,7 +128,7 @@ sub sessioncgi ($$) { $add=1 unless length $add; $add++; } - $q->param('page', $page.$add); + $q->param('page', "/$from/$page$add"); # now go create the page $q->param('do', 'create'); # make sure the editpage plugin is loaded diff --git a/debian/changelog b/debian/changelog index 4e9a92eab..630a4498a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ ikiwiki (3.20101202) UNRELEASED; urgency=low * Set HTML::Template's parent_global_vars option to allow using parameters like title_overridden that do not appear on the template. (intrigeri) (See https://rt.cpan.org/Public/Bug/Display.html?id=64158) + * inline: Force an absolute page location when the inline postform is used. -- Joey Hess Mon, 29 Nov 2010 14:44:13 -0400 diff --git a/doc/bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec.mdwn b/doc/bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec.mdwn index 45481bf21..2e2d35381 100644 --- a/doc/bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec.mdwn +++ b/doc/bugs/inline_action_buttons_circumvent_exclude_criteria_from_edittemplate__39__s_match__61____34____34___pagespec.mdwn @@ -11,3 +11,5 @@ However, if I use an inline directive like the following !inline pages="page(foo/bar/*)" rootpage="foo/bar" postform=yes actions=yes every page created via the action buttons incorrectly pulls in the text from the edittemplate registration. Changing the order of the conditions in the match="" pagespec has no impact. + +> [[fixed|done]] --[[Joey]] -- 2.39.5