urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix bug in deletion/move during edit code introduced in 1.44. Need to take 

the underlaydir into account.
master
joey 2007-08-14 19:44:59 +00:00
parent 89dc1d82e3
commit 69065b8e79
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IkiWiki.pm
View File

@ -11,7 +11,7 @@ use open qw{:utf8 :std};
use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase use vars qw{%config %links %oldlinks %pagemtime %pagectime %pagecase
%renderedfiles %oldrenderedfiles %pagesources %destsources %renderedfiles %oldrenderedfiles %pagesources %destsources
%depends %hooks %forcerebuild $gettext_obj}; %depends %hooks %forcerebuild $gettext_obj};
use Exporter q{import}; use Exporter q{import};
our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match our @EXPORT = qw(hook debug error template htmlpage add_depends pagespec_match
@ -96,7 +96,7 @@ sub defaultconfig () { #{{{
numbacklinks => 10, numbacklinks => 10,
account_creation_password => "", account_creation_password => "",
} #}}} } #}}}
sub checkconfig () { #{{{ sub checkconfig () { #{{{
# locale stuff; avoid LC_ALL since it overrides everything # locale stuff; avoid LC_ALL since it overrides everything
if (defined $ENV{LC_ALL}) { if (defined $ENV{LC_ALL}) {

3
IkiWiki/CGI.pm
View File

@ -497,7 +497,8 @@ sub cgi_editpage ($$) { #{{{
else { else {
# save page # save page
check_canedit($page, $q, $session); 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->field("do") ne "create") {
$form->tmpl_param("page_gone", 1); $form->tmpl_param("page_gone", 1);
$form->field(name => "do", value => "create", force => 1); $form->field(name => "do", value => "create", force => 1);

4
debian/changelog vendored
View File

@ -27,8 +27,10 @@ ikiwiki (2.6) UNRELEASED; urgency=low
be written in any language that can do XML RPC. be written in any language that can do XML RPC.
* Change yet again how unhandled and escaped preprocessor directives are * Change yet again how unhandled and escaped preprocessor directives are
re-output onto the page. Hopefully I finally got it right.. 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 ikiwiki (2.5) unstable; urgency=low

2
po/ikiwiki.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"