X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a3f224cb6cf82b89cf0cbadbd661fd5d71ebf8ae..8aff1348e6fe0e11eb4266d9be1203f50ba3dedd:/IkiWiki/CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 4d4464c28..87cb9c3f3 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -354,9 +354,9 @@ sub cgi_editpage ($$) { #{{{
 		});
 		$form->tmpl_param("page_preview",
 			htmlize($page, $type,
-			linkify($page, "",
-			preprocess($page, $page,
-			filter($page, $page, $content), 0, 1))));
+			linkify($page, "/",
+			preprocess($page, "/",
+			filter($page, "/", $content), 0, 1))));
 		# previewing may have created files on disk
 		saveindex();
 	}
@@ -394,9 +394,10 @@ sub cgi_editpage ($$) { #{{{
 					$dir=~s![^/]+/+$!!;
 					push @page_locs, $dir.$page;
 				}
+			
+				push @page_locs, "$config{userdir}/$page"
+					if length $config{userdir};
 			}
-			push @page_locs, "$config{userdir}/$page"
-				if length $config{userdir};
 
 			@page_locs = grep {
 				! exists $pagecase{lc $_}
@@ -404,8 +405,16 @@ sub cgi_editpage ($$) { #{{{
 			if (! @page_locs) {
 				# hmm, someone else made the page in the
 				# meantime?
-				redirect($q, "$config{url}/".htmlpage($page));
-				return;
+				if ($form->submitted eq "Preview") {
+					# let them go ahead with the edit
+					# and resolve the conflict at save
+					# time
+					@page_locs=$page;
+				}
+				else {
+					redirect($q, "$config{url}/".htmlpage($page));
+					return;
+				}
 			}
 
 			my @editable_locs = grep {