From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Thu, 16 Mar 2006 21:43:30 +0000 (+0000)
Subject: ok, so we don't want to re-load page content into the form on preview..
X-Git-Tag: 1.0~339
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3a31d28970c54b00b0a161e6eb1bbb10a692802e;p=ikiwiki.git

ok, so we don't want to re-load page content into the form on preview..
---

diff --git a/ikiwiki b/ikiwiki
index 0463ba15d..de7c60cc9 100755
--- a/ikiwiki
+++ b/ikiwiki
@@ -1079,14 +1079,16 @@ sub cgi_editpage ($$) { #{{{
 			$form->title("creating $page");
 		}
 		elsif ($form->field("do") eq "edit") {
-			my $content="";
-			if (exists $pagesources{lc($page)}) {
-				$content=readfile("$config{srcdir}/$pagesources{lc($page)}");
-				$content=~s/\n/\r\n/g;
+			if (! length $form->field('content')) {
+				my $content="";
+				if (exists $pagesources{lc($page)}) {
+						$content=readfile("$config{srcdir}/$pagesources{lc($page)}");
+					$content=~s/\n/\r\n/g;
+				}
+				$form->field(name => "content", value => $content,
+					force => 1);
 			}
 			$form->tmpl_param("page_select", 0);
-			$form->field(name => "content", value => $content,
-				force => 1);
 			$form->field(name => "page", type => 'hidden');
 			$form->title("editing $page");
 		}