ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.523 by root, Sat Apr 17 02:39:46 2010 UTC vs.
Revision 1.524 by root, Sun Apr 18 07:08:07 2010 UTC

1842 1842
1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1844} 1844}
1845 1845
1846# also paths starting with '/' 1846# also paths starting with '/'
1847$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1847$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1848 1848
1849sub thawer_merge { 1849sub thawer_merge {
1850 my ($self, $merge) = @_; 1850 my ($self, $merge) = @_;
1851 1851
1852 # we have to keep some variables in memory intact 1852 # we have to keep some variables in memory intact
2343 2343
2344 delete $cf::MAP{$self->path}; 2344 delete $cf::MAP{$self->path};
2345 2345
2346 $self->unlink_save; 2346 $self->unlink_save;
2347 2347
2348 bless $self, "cf::map"; 2348 bless $self, "cf::map::wrap";
2349 delete $self->{deny_reset}; 2349 delete $self->{deny_reset};
2350 $self->{deny_save} = 1; 2350 $self->{deny_save} = 1;
2351 $self->reset_timeout (1); 2351 $self->reset_timeout (1);
2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2353 2353

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines