editpage: Be more aggressive (and less buggy) about cleaning up temporary files rendered during page preview.

16 files changed, 193 insertions, 113 deletions

diff --git a/IkiWiki.pm b/IkiWiki.pm
index e303c8f4f..9b7baa0ee 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -750,7 +750,7 @@ sub will_render ($$;$) { #{{{
 
 	# Important security check.
 	if (-e "$config{destdir}/$dest" && ! $config{rebuild} &&
-	    ! grep { $_ eq $dest } (@{$renderedfiles{$page}}, @{$oldrenderedfiles{$page}})) {
+	    ! grep { $_ eq $dest } (@{$renderedfiles{$page}}, @{$oldrenderedfiles{$page}}, @{$wikistate{editpage}{previews}})) {
 		error("$config{destdir}/$dest independently created, not overwriting with version from $page");
 	}
 
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm
index 687ebf51e..d12c6732d 100644
--- a/IkiWiki/Plugin/editpage.pm
+++ b/IkiWiki/Plugin/editpage.pm
@@ -8,6 +8,7 @@ use open qw{:utf8 :std};
 
 sub import { #{{{
 	hook(type => "getsetup", id => "editpage", call => \&getsetup);
+	hook(type => "refresh", id => "editpage", call => \&refresh);
         hook(type => "sessioncgi", id => "editpage", call => \&IkiWiki::cgi_editpage);
 } # }}}
 
@@ -19,6 +20,26 @@ sub getsetup () { #{{{
 		},
 } #}}}
 
+sub refresh () {
+	if (exists $wikistate{editpage} && exists $wikistate{editpage}{previews}) {
+		# Expire old preview files after one hour.
+		my $expire=time - (60 * 60);
+
+		my @previews;
+		foreach my $file (@{$wikistate{editpage}{previews}}) {
+			my $mtime=(stat("$config{destdir}/$file"))[9];
+			if (defined $mtime && $mtime <= $expire) {
+				debug(sprintf(gettext("removing old preview %s"), $file));
+				IkiWiki::prune("$config{destdir}/$file");
+			}
+			elsif (defined $mtime) {
+				push @previews, $file;
+			}
+		}
+		$wikistate{editpage}{previews}=\@previews;
+	}
+}
+
 # Back to ikiwiki namespace for the rest, this code is very much
 # internal to ikiwiki even though it's separated into a plugin,
 # and other plugins use the functions below.
@@ -169,6 +190,7 @@ sub cgi_editpage ($$) { #{{{
 			# temporarily record its type
 			$pagesources{$page}=$page.".".$type;
 		}
+		my %wasrendered=map { $_ => 1 } @{$renderedfiles{$page}};
 
 		my $content=$form->field('editcontent');
 
@@ -191,11 +213,18 @@ sub cgi_editpage ($$) { #{{{
 			);
 		});
 		$form->tmpl_param("page_preview", $preview);
-	
+		
 		if ($new) {
 			delete $pagesources{$page};
 		}
-		# previewing may have created files on disk
+
+		# Previewing may have created files on disk.
+		# Keep a list of these to be deleted later.
+		my %previews = map { $_ => 1 } @{$wikistate{editpage}{previews}};
+		foreach my $file (@{$renderedfiles{$page}}) {
+			$previews{$file}=1 unless $wasrendered{$file};
+		}
+		@{$wikistate{editpage}{previews}} = keys %previews;
 		saveindex();
 	}
 	elsif ($form->submitted eq "Save Page") {
diff --git a/IkiWiki/Plugin/edittemplate.pm b/IkiWiki/Plugin/edittemplate.pm
index 189a066d8..846b4e7c8 100644
--- a/IkiWiki/Plugin/edittemplate.pm
+++ b/IkiWiki/Plugin/edittemplate.pm
@@ -16,8 +16,6 @@ sub import { #{{{
 		call => \&preprocess);
 	hook(type => "formbuilder", id => "edittemplate",
 		call => \&formbuilder);
-	hook(type => "refresh", id => "edittemplate",
-		call => \&refresh);
 } #}}}
 
 sub getsetup () { #{{{
@@ -140,8 +138,4 @@ sub filltemplate ($$) { #{{{
 	return $template->output;
 } #}}}
 
-sub refresh () {
-	
-}
-
 1
diff --git a/debian/changelog b/debian/changelog
index 04a3975c8..394eba26a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ ikiwiki (2.66) UNRELEASED; urgency=low
     index format should be transparent.
   * Add %wikistate, which is like %pagestate except not specific to a given
     page, and is preserved across rebuilds.
+  * editpage: Be more aggressive (and less buggy) about cleaning up
+    temporary files rendered during page preview.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 25 Sep 2008 13:45:55 -0400
 
diff --git a/doc/bugs/previewing_new_page_can_leave_files_dangling.mdwn b/doc/bugs/previewing_new_page_can_leave_files_dangling.mdwn
index ecb7f1bf5..22df485ad 100644
--- a/doc/bugs/previewing_new_page_can_leave_files_dangling.mdwn
+++ b/doc/bugs/previewing_new_page_can_leave_files_dangling.mdwn
@@ -31,7 +31,7 @@ I refresh and rebuild a few times, and the files are still dangling there.  If I
 > One fix would be to stash a copy of `%renderedfiles` before generating
 > the preview, then compare it afterwards to see how it changed and
 > determine what files were added, and record those someplace, and delete
-> them on a future refresh (after some reasonable time period).
+> them on a future refresh (after some reasonable time period). [[done]]
 > 
 > Another approach would be to make previewing always render files with
 > some well-known temporary name. Then all such temp files could be removed
diff --git a/po/bg.po b/po/bg.po
index a47c07acd..7154fa2a4 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-27 14:10-0400\n"
+"POT-Creation-Date: 2008-09-27 17:03-0400\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -24,7 +24,7 @@ msgstr "Първо трябва да влезете."
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:311
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:339
 msgid "Your login session has expired."
 msgstr ""
 
@@ -175,7 +175,7 @@ msgstr ""
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:222
+#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:250
 #: ../IkiWiki/Plugin/inline.pm:323 ../IkiWiki/Plugin/opendiscussion.pm:26
 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
 #: ../IkiWiki/Render.pm:149
@@ -207,19 +207,24 @@ msgstr ""
 msgid "no text was copied in this page with id %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:111
+#: ../IkiWiki/Plugin/editpage.pm:32
+#, fuzzy, perl-format
+msgid "removing old preview %s"
+msgstr "премахване на старата страница „%s”"
+
+#: ../IkiWiki/Plugin/editpage.pm:132
 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:278
+#: ../IkiWiki/Plugin/editpage.pm:306
 #, perl-format
 msgid "creating %s"
 msgstr "създаване на %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:296 ../IkiWiki/Plugin/editpage.pm:324
-#: ../IkiWiki/Plugin/editpage.pm:334 ../IkiWiki/Plugin/editpage.pm:369
-#: ../IkiWiki/Plugin/editpage.pm:414
+#: ../IkiWiki/Plugin/editpage.pm:324 ../IkiWiki/Plugin/editpage.pm:352
+#: ../IkiWiki/Plugin/editpage.pm:362 ../IkiWiki/Plugin/editpage.pm:397
+#: ../IkiWiki/Plugin/editpage.pm:442
 #, perl-format
 msgid "editing %s"
 msgstr "промяна на %s"
@@ -948,7 +953,7 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
 
-#: ../IkiWiki.pm:1614
+#: ../IkiWiki.pm:1635
 msgid "yes"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index cf985d2e0..e6b5c43e4 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-27 14:10-0400\n"
+"POT-Creation-Date: 2008-09-27 17:03-0400\n"
 "PO-Revision-Date: 2007-05-09 21:21+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -23,7 +23,7 @@ msgstr "Nejprve se musíte přihlásit."
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "přihlášení selhalo; možná si musíte povolit cookies?"
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:311
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:339
 msgid "Your login session has expired."
 msgstr ""
 
@@ -172,7 +172,7 @@ msgstr ""
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:222
+#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:250
 #: ../IkiWiki/Plugin/inline.pm:323 ../IkiWiki/Plugin/opendiscussion.pm:26
 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
 #: ../IkiWiki/Render.pm:149
@@ -204,19 +204,24 @@ msgstr ""
 msgid "no text was copied in this page with id %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:111
+#: ../IkiWiki/Plugin/editpage.pm:32
+#, fuzzy, perl-format
+msgid "removing old preview %s"
+msgstr "odstraňuji starou stránku %s"
+
+#: ../IkiWiki/Plugin/editpage.pm:132
 #, perl-format
 msgid "%s is not an editable page"
 msgstr "%s není editovatelná stránka"
 
-#: ../IkiWiki/Plugin/editpage.pm:278
+#: ../IkiWiki/Plugin/editpage.pm:306
 #, perl-format
 msgid "creating %s"
 msgstr "vytvářím %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:296 ../IkiWiki/Plugin/editpage.pm:324
-#: ../IkiWiki/Plugin/editpage.pm:334 ../IkiWiki/Plugin/editpage.pm:369
-#: ../IkiWiki/Plugin/editpage.pm:414
+#: ../IkiWiki/Plugin/editpage.pm:324 ../IkiWiki/Plugin/editpage.pm:352
+#: ../IkiWiki/Plugin/editpage.pm:362 ../IkiWiki/Plugin/editpage.pm:397
+#: ../IkiWiki/Plugin/editpage.pm:442
 #, perl-format
 msgid "editing %s"
 msgstr "upravuji %s"
@@ -927,7 +932,7 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Byla rozpoznána smyčka direktivy %s na %s v hloubce %i"
 
-#: ../IkiWiki.pm:1614
+#: ../IkiWiki.pm:1635
 msgid "yes"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index 3482d83ad..0834581fa 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-27 14:10-0400\n"
+"POT-Creation-Date: 2008-09-27 17:03-0400\n"
 "PO-Revision-Date: 2008-08-11 01:04+0200\n"
 "Last-Translator: Jonas Smedegaard <dr@jones.dk>\n"
 "Language-Team: None\n"
@@ -27,7 +27,7 @@ msgstr "Du skal først logge på."
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "Pålogning mislykkedes, måske skal du tillade infokager (cookies)?"
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:311
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:339
 msgid "Your login session has expired."
 msgstr "Din kørsel (login session) er udløbet"
 
@@ -174,7 +174,7 @@ msgstr "vedhæftningsoplægning"
 msgid "automatic index generation"
 msgstr "automatisk indeks-dannelse"
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:222
+#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:250
 #: ../IkiWiki/Plugin/inline.pm:323 ../IkiWiki/Plugin/opendiscussion.pm:26
 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
 #: ../IkiWiki/Render.pm:149
@@ -206,19 +206,24 @@ msgstr "ingen tekst blev kopieret i denne side"
 msgid "no text was copied in this page with id %s"
 msgstr "ingen tekst blev kopieret i denne side med id %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:111
+#: ../IkiWiki/Plugin/editpage.pm:32
+#, fuzzy, perl-format
+msgid "removing old preview %s"
+msgstr "fjerner gammel side %s"
+
+#: ../IkiWiki/Plugin/editpage.pm:132
 #, perl-format
 msgid "%s is not an editable page"
 msgstr "%s er ikke en redigérbar side"
 
-#: ../IkiWiki/Plugin/editpage.pm:278
+#: ../IkiWiki/Plugin/editpage.pm:306
 #, perl-format
 msgid "creating %s"
 msgstr "opretter %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:296 ../IkiWiki/Plugin/editpage.pm:324
-#: ../IkiWiki/Plugin/editpage.pm:334 ../IkiWiki/Plugin/editpage.pm:369
-#: ../IkiWiki/Plugin/editpage.pm:414
+#: ../IkiWiki/Plugin/editpage.pm:324 ../IkiWiki/Plugin/editpage.pm:352
+#: ../IkiWiki/Plugin/editpage.pm:362 ../IkiWiki/Plugin/editpage.pm:397
+#: ../IkiWiki/Plugin/editpage.pm:442
 #, perl-format
 msgid "editing %s"
 msgstr "redigerer %s"
@@ -919,7 +924,7 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "forudberegningssløkke fundet på %s ved dybde %i"
 
-#: ../IkiWiki.pm:1614
+#: ../IkiWiki.pm:1635
 msgid "yes"
 msgstr "ja"
 
diff --git a/po/de.po b/po/de.po
index 68fa02b64..59675ff2a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 2.40\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-27 14:10-0400\n"
+"POT-Creation-Date: 2008-09-27 17:03-0400\n"
 "PO-Revision-Date: 2008-03-03 21:22+0100\n"
 "Last-Translator: Kai Wasserbäch <debian@carbon-project.org>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -23,7 +23,7 @@ msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 "Anmeldung fehlgeschlagen, möglicherweise müssen Sie zuvor Cookies aktivieren?"
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:311
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:339
 msgid "Your login session has expired."
 msgstr ""
 
@@ -172,7 +172,7 @@ msgstr ""
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:222
+#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:250
 #: ../IkiWiki/Plugin/inline.pm:323 ../IkiWiki/Plugin/opendiscussion.pm:26
 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
 #: ../IkiWiki/Render.pm:149
@@ -204,19 +204,24 @@ msgstr ""
 msgid "no text was copied in this page with id %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:111
+#: ../IkiWiki/Plugin/editpage.pm:32
+#, fuzzy, perl-format
+msgid "removing old preview %s"
+msgstr "entferne alte Seite %s"
+
+#: ../IkiWiki/Plugin/editpage.pm:132
 #, perl-format
 msgid "%s is not an editable page"
 msgstr "%s ist keine bearbeitbare Seite"
 
-#: ../IkiWiki/Plugin/editpage.pm:278
+#: ../IkiWiki/Plugin/editpage.pm:306
 #, perl-format
 msgid "creating %s"
 msgstr "erstelle %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:296 ../IkiWiki/Plugin/editpage.pm:324
-#: ../IkiWiki/Plugin/editpage.pm:334 ../IkiWiki/Plugin/editpage.pm:369
-#: ../IkiWiki/Plugin/editpage.pm:414
+#: ../IkiWiki/Plugin/editpage.pm:324 ../IkiWiki/Plugin/editpage.pm:352
+#: ../IkiWiki/Plugin/editpage.pm:362 ../IkiWiki/Plugin/editpage.pm:397
+#: ../IkiWiki/Plugin/editpage.pm:442
 #, perl-format
 msgid "editing %s"
 msgstr "bearbeite %s"
@@ -924,7 +929,7 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "Präprozessorschleife %s auf Seite %s in Tiefe %i erkannt"
 
-#: ../IkiWiki.pm:1614
+#: ../IkiWiki.pm:1635
 msgid "yes"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index f3abf98c4..192ee63ff 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-27 14:10-0400\n"
+"POT-Creation-Date: 2008-09-27 17:03-0400\n"
 "PO-Revision-Date: 2008-03-06 11:07+0100\n"
 "Last-Translator: Víctor Moral <victor@taquiones.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -24,7 +24,7 @@ msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 "registro fallido, ¿ tal vez necesita activar las cookies en el navegador ?"
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:311
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:339
 msgid "Your login session has expired."
 msgstr ""
 
@@ -173,7 +173,7 @@ msgstr ""
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:222
+#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:250
 #: ../IkiWiki/Plugin/inline.pm:323 ../IkiWiki/Plugin/opendiscussion.pm:26
 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
 #: ../IkiWiki/Render.pm:149
@@ -205,19 +205,24 @@ msgstr ""
 msgid "no text was copied in this page with id %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:111
+#: ../IkiWiki/Plugin/editpage.pm:32
+#, fuzzy, perl-format
+msgid "removing old preview %s"
+msgstr "eliminando la antigua página %s"
+
+#: ../IkiWiki/Plugin/editpage.pm:132
 #, perl-format
 msgid "%s is not an editable page"
 msgstr "la página %s no es modificable"
 
-#: ../IkiWiki/Plugin/editpage.pm:278
+#: ../IkiWiki/Plugin/editpage.pm:306
 #, perl-format
 msgid "creating %s"
 msgstr "creando página %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:296 ../IkiWiki/Plugin/editpage.pm:324
-#: ../IkiWiki/Plugin/editpage.pm:334 ../IkiWiki/Plugin/editpage.pm:369
-#: ../IkiWiki/Plugin/editpage.pm:414
+#: ../IkiWiki/Plugin/editpage.pm:324 ../IkiWiki/Plugin/editpage.pm:352
+#: ../IkiWiki/Plugin/editpage.pm:362 ../IkiWiki/Plugin/editpage.pm:397
+#: ../IkiWiki/Plugin/editpage.pm:442
 #, perl-format
 msgid "editing %s"
 msgstr "modificando página %s"
@@ -931,7 +936,7 @@ msgstr ""
 "se ha detectado un bucle de preprocesado %s en la página %s en la vuelta "
 "número %i"
 
-#: ../IkiWiki.pm:1614
+#: ../IkiWiki.pm:1635
 msgid "yes"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 46ed3b609..ecfed79a7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-27 14:10-0400\n"
+"POT-Creation-Date: 2008-09-27 17:03-0400\n"
 "PO-Revision-Date: 2008-04-29 17:46+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -27,7 +27,7 @@ msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 "Échec de l'identification, vous devriez peut-être autoriser les cookies."
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:311
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:339
 msgid "Your login session has expired."
 msgstr "Session d'authentification expirée."
 
@@ -176,7 +176,7 @@ msgstr ""
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:222
+#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:250
 #: ../IkiWiki/Plugin/inline.pm:323 ../IkiWiki/Plugin/opendiscussion.pm:26
 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
 #: ../IkiWiki/Render.pm:149
@@ -208,19 +208,24 @@ msgstr ""
 msgid "no text was copied in this page with id %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:111
+#: ../IkiWiki/Plugin/editpage.pm:32
+#, fuzzy, perl-format
+msgid "removing old preview %s"
+msgstr "Suppression de l'ancienne page %s"
+
+#: ../IkiWiki/Plugin/editpage.pm:132
 #, perl-format
 msgid "%s is not an editable page"
 msgstr "%s n'est pas une page éditable"
 
-#: ../IkiWiki/Plugin/editpage.pm:278
+#: ../IkiWiki/Plugin/editpage.pm:306
 #, perl-format
 msgid "creating %s"
 msgstr "Création de %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:296 ../IkiWiki/Plugin/editpage.pm:324
-#: ../IkiWiki/Plugin/editpage.pm:334 ../IkiWiki/Plugin/editpage.pm:369
-#: ../IkiWiki/Plugin/editpage.pm:414
+#: ../IkiWiki/Plugin/editpage.pm:324 ../IkiWiki/Plugin/editpage.pm:352
+#: ../IkiWiki/Plugin/editpage.pm:362 ../IkiWiki/Plugin/editpage.pm:397
+#: ../IkiWiki/Plugin/editpage.pm:442
 #, perl-format
 msgid "editing %s"
 msgstr "Édition de %s"
@@ -931,7 +936,7 @@ msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 "%s une boucle a été détectée dans le prétraitement de %s, à la profondeur %i"
 
-#: ../IkiWiki.pm:1614
+#: ../IkiWiki.pm:1635
 msgid "yes"
 msgstr ""
 
diff --git a/po/gu.po b/po/gu.po
index 8243d5f03..0d97fe727 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-27 14:10-0400\n"
+"POT-Creation-Date: 2008-09-27 17:03-0400\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -23,7 +23,7 @@ msgstr "તમારે પ્રથમ લોગ ઇન થવું પડશ�
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr "પ્રવેશ નિષ્ફળ, કદાચ તમારી કુકીઓ સક્રિય બનાવવી પડશે?"
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:311
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:339
 msgid "Your login session has expired."
 msgstr ""
 
@@ -173,7 +173,7 @@ msgstr ""
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:222
+#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:250
 #: ../IkiWiki/Plugin/inline.pm:323 ../IkiWiki/Plugin/opendiscussion.pm:26
 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
 #: ../IkiWiki/Render.pm:149
@@ -205,19 +205,24 @@ msgstr ""
 msgid "no text was copied in this page with id %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:111
+#: ../IkiWiki/Plugin/editpage.pm:32
+#, fuzzy, perl-format
+msgid "removing old preview %s"
+msgstr "જુનાં પાનાં દૂર કરે છે %s"
+
+#: ../IkiWiki/Plugin/editpage.pm:132
 #, perl-format
 msgid "%s is not an editable page"
 msgstr "%s એ સુધારી શકાય તેવું પાનું નથી"
 
-#: ../IkiWiki/Plugin/editpage.pm:278
+#: ../IkiWiki/Plugin/editpage.pm:306
 #, perl-format
 msgid "creating %s"
 msgstr "%s બનાવે છે"
 
-#: ../IkiWiki/Plugin/editpage.pm:296 ../IkiWiki/Plugin/editpage.pm:324
-#: ../IkiWiki/Plugin/editpage.pm:334 ../IkiWiki/Plugin/editpage.pm:369
-#: ../IkiWiki/Plugin/editpage.pm:414
+#: ../IkiWiki/Plugin/editpage.pm:324 ../IkiWiki/Plugin/editpage.pm:352
+#: ../IkiWiki/Plugin/editpage.pm:362 ../IkiWiki/Plugin/editpage.pm:397
+#: ../IkiWiki/Plugin/editpage.pm:442
 #, perl-format
 msgid "editing %s"
 msgstr "%s સુધારે છે"
@@ -927,7 +932,7 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s પર શોધાયેલ લુપ  %s પર ચલાવે છે %i ઉંડાણ પર"
 
-#: ../IkiWiki.pm:1614
+#: ../IkiWiki.pm:1635
 msgid "yes"
 msgstr ""
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 200b3f6d8..9d4b00cf0 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: 2008-09-27 16:40-0400\n"
+"POT-Creation-Date: 2008-09-27 17:03-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"
@@ -24,7 +24,7 @@ msgstr ""
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:311
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:339
 msgid "Your login session has expired."
 msgstr ""
 
@@ -171,7 +171,7 @@ msgstr ""
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:222
+#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:250
 #: ../IkiWiki/Plugin/inline.pm:323 ../IkiWiki/Plugin/opendiscussion.pm:26
 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
 #: ../IkiWiki/Render.pm:149
@@ -203,37 +203,42 @@ msgstr ""
 msgid "no text was copied in this page with id %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:111
+#: ../IkiWiki/Plugin/editpage.pm:32
+#, perl-format
+msgid "removing old preview %s"
+msgstr ""
+
+#: ../IkiWiki/Plugin/editpage.pm:132
 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:278
+#: ../IkiWiki/Plugin/editpage.pm:306
 #, perl-format
 msgid "creating %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:296 ../IkiWiki/Plugin/editpage.pm:324
-#: ../IkiWiki/Plugin/editpage.pm:334 ../IkiWiki/Plugin/editpage.pm:369
-#: ../IkiWiki/Plugin/editpage.pm:414
+#: ../IkiWiki/Plugin/editpage.pm:324 ../IkiWiki/Plugin/editpage.pm:352
+#: ../IkiWiki/Plugin/editpage.pm:362 ../IkiWiki/Plugin/editpage.pm:397
+#: ../IkiWiki/Plugin/editpage.pm:442
 #, perl-format
 msgid "editing %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:53
+#: ../IkiWiki/Plugin/edittemplate.pm:51
 msgid "template not specified"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:56
+#: ../IkiWiki/Plugin/edittemplate.pm:54
 msgid "match not specified"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:64
+#: ../IkiWiki/Plugin/edittemplate.pm:62
 #, perl-format
 msgid "edittemplate %s registered for %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/edittemplate.pm:135
+#: ../IkiWiki/Plugin/edittemplate.pm:133
 msgid "failed to process"
 msgstr ""
 
@@ -910,7 +915,7 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr ""
 
-#: ../IkiWiki.pm:1632
+#: ../IkiWiki.pm:1635
 msgid "yes"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index d65354f7f..f6fb112af 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.51\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-27 14:10-0400\n"
+"POT-Creation-Date: 2008-09-27 17:03-0400\n"
 "PO-Revision-Date: 2007-04-27 22:05+0200\n"
 "Last-Translator: Pawel Tecza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -26,7 +26,7 @@ msgstr ""
 "Nieudane logowanie. Proszę sprawdzić czy w przeglądarce włączone są "
 "ciasteczka (ang. cookies)"
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:311
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:339
 msgid "Your login session has expired."
 msgstr ""
 
@@ -177,7 +177,7 @@ msgstr ""
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:222
+#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:250
 #: ../IkiWiki/Plugin/inline.pm:323 ../IkiWiki/Plugin/opendiscussion.pm:26
 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
 #: ../IkiWiki/Render.pm:149
@@ -209,19 +209,24 @@ msgstr ""
 msgid "no text was copied in this page with id %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:111
+#: ../IkiWiki/Plugin/editpage.pm:32
+#, fuzzy, perl-format
+msgid "removing old preview %s"
+msgstr "usuwanie starej strony %s"
+
+#: ../IkiWiki/Plugin/editpage.pm:132
 #, perl-format
 msgid "%s is not an editable page"
 msgstr "Strona %s nie może być edytowana"
 
-#: ../IkiWiki/Plugin/editpage.pm:278
+#: ../IkiWiki/Plugin/editpage.pm:306
 #, perl-format
 msgid "creating %s"
 msgstr "tworzenie %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:296 ../IkiWiki/Plugin/editpage.pm:324
-#: ../IkiWiki/Plugin/editpage.pm:334 ../IkiWiki/Plugin/editpage.pm:369
-#: ../IkiWiki/Plugin/editpage.pm:414
+#: ../IkiWiki/Plugin/editpage.pm:324 ../IkiWiki/Plugin/editpage.pm:352
+#: ../IkiWiki/Plugin/editpage.pm:362 ../IkiWiki/Plugin/editpage.pm:397
+#: ../IkiWiki/Plugin/editpage.pm:442
 #, perl-format
 msgid "editing %s"
 msgstr "edycja %s"
@@ -954,7 +959,7 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i"
 
-#: ../IkiWiki.pm:1614
+#: ../IkiWiki.pm:1635
 msgid "yes"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index c62895b42..7a0b1af13 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-27 14:10-0400\n"
+"POT-Creation-Date: 2008-09-27 17:03-0400\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -23,7 +23,7 @@ msgstr "Du måste logga in först."
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:311
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:339
 msgid "Your login session has expired."
 msgstr ""
 
@@ -174,7 +174,7 @@ msgstr ""
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:222
+#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:250
 #: ../IkiWiki/Plugin/inline.pm:323 ../IkiWiki/Plugin/opendiscussion.pm:26
 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
 #: ../IkiWiki/Render.pm:149
@@ -206,19 +206,24 @@ msgstr ""
 msgid "no text was copied in this page with id %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:111
+#: ../IkiWiki/Plugin/editpage.pm:32
+#, fuzzy, perl-format
+msgid "removing old preview %s"
+msgstr "tar bort gammal sida %s"
+
+#: ../IkiWiki/Plugin/editpage.pm:132
 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:278
+#: ../IkiWiki/Plugin/editpage.pm:306
 #, perl-format
 msgid "creating %s"
 msgstr "skapar %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:296 ../IkiWiki/Plugin/editpage.pm:324
-#: ../IkiWiki/Plugin/editpage.pm:334 ../IkiWiki/Plugin/editpage.pm:369
-#: ../IkiWiki/Plugin/editpage.pm:414
+#: ../IkiWiki/Plugin/editpage.pm:324 ../IkiWiki/Plugin/editpage.pm:352
+#: ../IkiWiki/Plugin/editpage.pm:362 ../IkiWiki/Plugin/editpage.pm:397
+#: ../IkiWiki/Plugin/editpage.pm:442
 #, perl-format
 msgid "editing %s"
 msgstr "redigerar %s"
@@ -941,7 +946,7 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
 
-#: ../IkiWiki.pm:1614
+#: ../IkiWiki.pm:1635
 msgid "yes"
 msgstr ""
 
diff --git a/po/vi.po b/po/vi.po
index 40de1f18a..cfdc18916 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-27 14:10-0400\n"
+"POT-Creation-Date: 2008-09-27 17:03-0400\n"
 "PO-Revision-Date: 2007-01-13 15:31+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -24,7 +24,7 @@ msgstr "Trước tiên bạn cần phải đăng nhập."
 msgid "login failed, perhaps you need to turn on cookies?"
 msgstr ""
 
-#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:311
+#: ../IkiWiki/CGI.pm:163 ../IkiWiki/Plugin/editpage.pm:339
 msgid "Your login session has expired."
 msgstr ""
 
@@ -175,7 +175,7 @@ msgstr ""
 msgid "automatic index generation"
 msgstr ""
 
-#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:222
+#: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:250
 #: ../IkiWiki/Plugin/inline.pm:323 ../IkiWiki/Plugin/opendiscussion.pm:26
 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
 #: ../IkiWiki/Render.pm:149
@@ -207,19 +207,24 @@ msgstr ""
 msgid "no text was copied in this page with id %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:111
+#: ../IkiWiki/Plugin/editpage.pm:32
+#, fuzzy, perl-format
+msgid "removing old preview %s"
+msgstr "đang gỡ bỏ trang cũ %s"
+
+#: ../IkiWiki/Plugin/editpage.pm:132
 #, perl-format
 msgid "%s is not an editable page"
 msgstr ""
 
-#: ../IkiWiki/Plugin/editpage.pm:278
+#: ../IkiWiki/Plugin/editpage.pm:306
 #, perl-format
 msgid "creating %s"
 msgstr "đang tạo %s"
 
-#: ../IkiWiki/Plugin/editpage.pm:296 ../IkiWiki/Plugin/editpage.pm:324
-#: ../IkiWiki/Plugin/editpage.pm:334 ../IkiWiki/Plugin/editpage.pm:369
-#: ../IkiWiki/Plugin/editpage.pm:414
+#: ../IkiWiki/Plugin/editpage.pm:324 ../IkiWiki/Plugin/editpage.pm:352
+#: ../IkiWiki/Plugin/editpage.pm:362 ../IkiWiki/Plugin/editpage.pm:397
+#: ../IkiWiki/Plugin/editpage.pm:442
 #, perl-format
 msgid "editing %s"
 msgstr "đang sửa %s"
@@ -942,7 +947,7 @@ msgstr ""
 msgid "preprocessing loop detected on %s at depth %i"
 msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i"
 
-#: ../IkiWiki.pm:1614
+#: ../IkiWiki.pm:1635
 msgid "yes"
 msgstr ""