From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Tue, 14 Aug 2007 19:44:59 +0000 (+0000)
Subject: * Fix bug in deletion/move during edit code introduced in 1.44. Need to take
X-Git-Tag: 2.6~135
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/69065b8e79cce13648db711ed1fefaf6f41713fd
* Fix bug in deletion/move during edit code introduced in 1.44. Need to take
the underlaydir into account.
---
diff --git a/IkiWiki.pm b/IkiWiki.pm
index 6b74bf08a..18efaea71 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -11,7 +11,7 @@ use open qw{:utf8 :std};
use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
%renderedfiles %oldrenderedfiles %pagesources %destsources
- %depends %hooks %forcerebuild $gettext_obj};
+ %depends %hooks %forcerebuild $gettext_obj};
use Exporter q{import};
our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
@@ -96,7 +96,7 @@ sub defaultconfig () { #{{{
numbacklinks => 10,
account_creation_password => "",
} #}}}
-
+
sub checkconfig () { #{{{
# locale stuff; avoid LC_ALL since it overrides everything
if (defined $ENV{LC_ALL}) {
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 5aa744c94..a073a4edd 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -497,7 +497,8 @@ sub cgi_editpage ($$) { #{{{
else {
# save page
check_canedit($page, $q, $session);
- if (! -e "$config{srcdir}/$file" &&
+ if (! -e "$config{srcdir}/$file" &&
+ ! -e "$config{underlaydir}/$file" &&
$form->field("do") ne "create") {
$form->tmpl_param("page_gone", 1);
$form->field(name => "do", value => "create", force => 1);
diff --git a/debian/changelog b/debian/changelog
index 0605e1191..d73c75595 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,8 +27,10 @@ ikiwiki (2.6) UNRELEASED; urgency=low
be written in any language that can do XML RPC.
* Change yet again how unhandled and escaped preprocessor directives are
re-output onto the page. Hopefully I finally got it right..
+ * Fix bug in deletion/move during edit code introduced in 1.44. Need to take
+ the underlaydir into account.
- -- Joey Hess <joeyh@debian.org> Mon, 13 Aug 2007 13:34:29 -0400
+ -- Joey Hess <joeyh@debian.org> Tue, 14 Aug 2007 15:41:21 -0400
ikiwiki (2.5) unstable; urgency=low
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 48efd64e5..4d182888b 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: 2007-08-13 13:33-0400\n"
+"POT-Creation-Date: 2007-08-14 02:46-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"