Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

Conflicts:

	doc/bugs/previewing_with_an_edittemplate_reverts_edit_box.mdwn

diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index cdcdd074f5ff63f64ed7190c6b84b221f5a697ca..98308de135ba42c6efc5d574b261d51cc5f18e29 100644 (file)
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -64,7 +64,9 @@ sub formbuilder (@) { #{{{
        my %params=@_;
        my $form=$params{form};
 
-       return if $form->field("do") ne "create";
+       return if $form->field("do") ne "create" ||
+               length $form->field("editcontent");
+       
        my $page=$form->field("page");
        
        # The tricky bit here is that $page is probably just the base

diff --git a/debian/changelog b/debian/changelog
index c6f5fa6eed2f394110267fb52213de57443b4e0d..0730c1f3fbe67d5e3159eb40a9b65efcd3cda074 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ ikiwiki (2.62) UNRELEASED; urgency=low
   * listdirectives: New plugin. (willu)
   * filecheck: New plugin factoring out the PageSpec additions that were
     originally part of the attachment plugin.
+  * edittemplate: Don't wipe out edits on preview.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 21 Aug 2008 16:20:58 -0400
 

diff --git a/doc/bugs/previewing_with_an_edittemplate_reverts_edit_box.mdwn b/doc/bugs/previewing_with_an_edittemplate_reverts_edit_box.mdwn
index d0bbbe969c81eaf0e77ed468495161ffa2e2b34f..4405a7ab8b5b5de35df0bbb8fc1a48a00760a70c 100644 (file)
--- a/doc/bugs/previewing_with_an_edittemplate_reverts_edit_box.mdwn
+++ b/doc/bugs/previewing_with_an_edittemplate_reverts_edit_box.mdwn
@@ -1,3 +1,5 @@
 The 'editcontent' textarea that should be saved across previews is being overridden whenever an edittemplate is in use, 'losing' edits on preview unless the browser maintains them in history.
 
   --[[JoeRayhawk]]
+
+> ugly one... [[done]] --[[Joey]]