*** old/TWiki/UI/Save.pm	2007-02-04 19:11:35.000000000 -0500
--- new/TWiki/UI/Save.pm	2007-03-08 11:53:13.000000000 -0500
***************
*** 88,96 ****
      }
  
      my $user = $session->{user};
-     TWiki::UI::checkAccess( $session, $webName, $topic,
-                             'change', $user );
- 
      my $saveOpts = {};
      $saveOpts->{minor} = 1 if $query->param( 'dontnotify' );
      my $originalrev = $query->param( 'originalrev' ); # rev edit started on
--- 88,93 ----
***************
*** 100,109 ****
  
      my ( $prevMeta, $prevText );
      my ( $templateText, $templateMeta );
-     my $templatetopic = $query->param( 'templatetopic');
      my $templateweb = $webName;
  
      if( $topicExists ) {
          ( $prevMeta, $prevText ) =
            $store->readTopic( $user, $webName, $topic, undef );
          if( $prevMeta ) {
--- 97,107 ----
  
      my ( $prevMeta, $prevText );
      my ( $templateText, $templateMeta );
      my $templateweb = $webName;
+     my $templatetopic = $query->param( 'templatetopic');
  
      if( $topicExists ) {
+     	TWiki::UI::checkAccess( $session, $webName, $topic, 'change', $user );
          ( $prevMeta, $prevText ) =
            $store->readTopic( $user, $webName, $topic, undef );
          if( $prevMeta ) {
***************
*** 114,139 ****
                  }
              }
          }
!     } elsif ($templatetopic) {
!         ( $templateweb, $templatetopic ) =
!           $session->normalizeWebTopicName( $templateweb, $templatetopic );
! 
!         ( $templateMeta, $templateText ) =
!           $store->readTopic( $user, $templateweb,
!                              $templatetopic, undef );
!         $templateText = '' if $query->param( 'newtopic' ); # created by edit
!         $templateText =
!           $session->expandVariablesOnTopicCreation( $templateText );
!         foreach my $k ( keys %$templateMeta ) {
!             unless( $k =~ /^_/ || $k eq 'FORM' || $k eq 'TOPICPARENT' ||
!                       $k eq 'FIELD' ) {
!                 $newMeta->copyFrom( $templateMeta, $k );
              }
          }
!         # topic creation, there is no original rev
!         $originalrev = 0;
      }
! 
      # Determine the new text
      my $newText = $query->param( 'text' );
  
--- 112,141 ----
                  }
              }
          }
!     } else {
!         if ($templatetopic) {
!             ( $templateweb, $templatetopic ) =
!               $session->normalizeWebTopicName( $templateweb, $templatetopic );
! 
! 
!             ( $templateMeta, $templateText ) =
!               $store->readTopic( $user, $templateweb,
!                                  $templatetopic, undef );
!             $templateText = '' if $query->param( 'newtopic' ); # created by edit
!             $templateText =
!               $session->expandVariablesOnTopicCreation( $templateText );
!             foreach my $k ( keys %$templateMeta ) {
!                 unless( $k =~ /^_/ || $k eq 'FORM' || $k eq 'TOPICPARENT' ||
!                          $k eq 'FIELD' ) {
!                     $newMeta->copyFrom( $templateMeta, $k );
!                 }
              }
+             # topic creation, there is no original rev
+             $originalrev = 0;
          }
!         TWiki::UI::checkAccess( $session, $webName, $templatetopic, 'create', $user );
      }
!     
      # Determine the new text
      my $newText = $query->param( 'text' );