bug fixes

This commit is contained in:
JT Smith 2004-09-24 16:09:32 +00:00
parent cc6cfe22b0
commit e6818b58fc
3 changed files with 16 additions and 5 deletions

View file

@ -9,6 +9,10 @@
- Fixed a problem where hidden form tags were not escaping macros properly.
- Fixed an XHTML problem with hidden form tags.
- Bugfix [ 1033561 ] HTMLArea 3 not working (Len Kranendonk)
- Fixed a paste page problem.
- Fixed a problem with the new export mechanism where it would just stop and
not report an error if it ran into a problem with creating folders and
files.
6.2.4

View file

@ -726,7 +726,8 @@ sub www_exportPageGenerate {
$path = $session{config}{exportPath} . $session{os}{slash} . $path;
eval { mkpath($path) };
if($@) {
print "Couldn't create $path: $@";
print "Couldn't create $path because $@ <br />\n";
print "This most likely means that you have a page with the same name as folder that you're trying to create.<br />\n";
return;
}
}
@ -741,9 +742,15 @@ sub www_exportPageGenerate {
);
# Open file
$file = $session{config}{exportPath} . $session{os}{slash} . $page->{urlizedTitle};
open(FILE, "> $file") || die "Can't open $file: $!";
print FILE $e->generate;
close(FILE);
eval { open(FILE, "> $file") or die "$!" };
if ($@) {
print "Couldn't open $file because $@ <br />\n";
print "This most likely means that you have created a page with the same name as an existing folder. <br />\n";
return;
} else {
print FILE $e->generate;
close(FILE);
}
print "DONE<br/>";
}

View file

@ -1294,7 +1294,7 @@ sub paste{
($self, $newMother) = @_;
# You do not want to paste a page onto itself, believe me.
return $self if ($self->get("pageId") == $newMother->get("pageId"));
return $self if ($self->get("pageId") eq $newMother->get("pageId"));
return WebGUI::ErrorHandler::fatalError("You cannot paste a page that's not on the clipboard. parentId:".
$self->get("parentId").", pageId:".$self->get("pageId")) unless ($self->get("parentId") == 2);