oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bugfix [ 1245765 ] Missing 'page not found' crashes settings

Browse source
This commit is contained in:
JT Smith 2005-08-23 19:37:11 +00:00
parent 2372905928
commit d39e649906
3 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/changelog/6.x.x.txt
View file

@ -1,8 +1,9 @@
6.7.2 6.7.2
- fix [ 1265788 ] SyndicatedContent *not working* in 6.7.x - fix [ 1265788 ] SyndicatedContent *not working* in 6.7.x
- fix [ 1245765 ] Missing 'page not found' crashes settings
6.7.1 6.7.1
- fix [ 1206046 ] function tinyMCE_WebGUI_Cleanup don't work
- Fixed a fatal error with Redirects - Fixed a fatal error with Redirects
- Fixed a fatal error in the date field in the new pluggable forms system. - Fixed a fatal error in the date field in the new pluggable forms system.
- Fixed a nasty logout bug. - Fixed a nasty logout bug.

1
lib/WebGUI/AssetClipboard.pm
View file

@ -49,6 +49,7 @@ Removes asset from lineage, places it in clipboard state. The "gap" in the linea
sub cut { sub cut {
my $self = shift; my $self = shift;
return undef if ($self->getId eq $session{setting}{defaultPage} || $self->getId eq $session{setting}{notFoundPage});
WebGUI::SQL->beginTransaction; WebGUI::SQL->beginTransaction;
WebGUI::SQL->write("update asset set state='clipboard-limbo' where lineage like ".quote($self->get("lineage").'%')." and state='published'"); WebGUI::SQL->write("update asset set state='clipboard-limbo' where lineage like ".quote($self->get("lineage").'%')." and state='published'");
WebGUI::SQL->write("update asset set state='clipboard', stateChangedBy=".quote($session{user}{userId}).", stateChanged=".time()." where assetId=".quote($self->getId)); WebGUI::SQL->write("update asset set state='clipboard', stateChangedBy=".quote($session{user}{userId}).", stateChanged=".time()." where assetId=".quote($self->getId));

2
lib/WebGUI/AssetTrash.pm
View file

@ -96,6 +96,7 @@ Deletes an asset from tables and removes anything bound to that asset.
sub purge { sub purge {
my $self = shift; my $self = shift;
return undef if ($self->getId eq $session{setting}{defaultPage} || $self->getId eq $session{setting}{notFoundPage});
WebGUI::SQL->beginTransaction; WebGUI::SQL->beginTransaction;
foreach my $definition (@{$self->definition}) { foreach my $definition (@{$self->definition}) {
WebGUI::SQL->write("delete from ".$definition->{tableName}." where assetId=".quote($self->getId)); WebGUI::SQL->write("delete from ".$definition->{tableName}." where assetId=".quote($self->getId));
@ -120,6 +121,7 @@ Removes asset from lineage, places it in trash state. The "gap" in the lineage i
sub trash { sub trash {
my $self = shift; my $self = shift;
return undef if ($self->getId eq $session{setting}{defaultPage} || $self->getId eq $session{setting}{notFoundPage});
WebGUI::SQL->beginTransaction; WebGUI::SQL->beginTransaction;
WebGUI::SQL->write("update asset set state='trash-limbo' where lineage like ".quote($self->get("lineage").'%')); WebGUI::SQL->write("update asset set state='trash-limbo' where lineage like ".quote($self->get("lineage").'%'));
WebGUI::SQL->write("update asset set state='trash', stateChangedBy=".quote($session{user}{userId}).", stateChanged=".time()." where assetId=".quote($self->getId)); WebGUI::SQL->write("update asset set state='trash', stateChangedBy=".quote($session{user}{userId}).", stateChanged=".time()." where assetId=".quote($self->getId));