*** templates/oopsleaseconflict.pattern.tmpl~ Fri Mar 31 23:44:56 2006
--- templates/oopsleaseconflict.pattern.tmpl Sun Jul 9 17:19:50 2006
***************
*** 12,23 ****
%{ Instantiate either lease_active or lease_old }%
%INSTANTIATE%
!
!
--- 12,23 ----
%{ Instantiate either lease_active or lease_old }%
%INSTANTIATE%
!
!
for =lib/TWiki/Func.pm=
*** lib/TWiki/Func.pm~ Fri Mar 31 23:44:35 2006
--- lib/TWiki/Func.pm Sun Jul 9 17:19:25 2006
***************
*** 834,843 ****
=cut
sub checkTopicEditLock {
! my( $web, $topic ) = @_;
ASSERT($TWiki::Plugins::SESSION) if DEBUG;
( $web, $topic ) = normalizeWebTopicName( $web, $topic );
my $lease = $TWiki::Plugins::SESSION->{store}->getLease( $web, $topic );
if( $lease ) {
--- 834,844 ----
=cut
sub checkTopicEditLock {
! my( $web, $topic, $script ) = @_;
ASSERT($TWiki::Plugins::SESSION) if DEBUG;
( $web, $topic ) = normalizeWebTopicName( $web, $topic );
+ $script ||= 'edit';
my $lease = $TWiki::Plugins::SESSION->{store}->getLease( $web, $topic );
if( $lease ) {
***************
*** 857,863 ****
def => 'active',
web => $web,
topic => $topic,
! params => [ $wn, $past, $future ] ),
$who, $remain / 60 );
}
}
--- 858,864 ----
def => 'active',
web => $web,
topic => $topic,
! params => [ $wn, $past, $future, $script ] ),
$who, $remain / 60 );
}
}