[TWiki-Dev] CVS: twiki/bin rename,1.26,1.27

[John T. <ta...@us...>]

Update of /cvsroot/twiki/twiki/bin
In directory usw-pr-cvs1:/tmp/cvs-serv22219/bin

Modified Files:
	rename 
Log Message:
Fix for RenameKillsAttachmentsAndFormsBug & RenameTopicProblemBug


Index: rename
===================================================================
RCS file: /cvsroot/twiki/twiki/bin/rename,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** rename	2001/09/07 14:17:05	1.26
--- rename	2001/09/29 04:51:00	1.27
***************
*** 107,111 ****
  	  my $renameError = &TWiki::Store::renameTopic( $oldWeb, $oldTopic, $newWeb, $newTopic, "relink" );
  	  if( $renameError ) {
! 	      TWiki::redirect( $query, &TWiki::getOopsUrl( $newWeb, $newTopic, "oopsrenameerr", $renameError ) );
  	      return;
             }
--- 107,111 ----
  	  my $renameError = &TWiki::Store::renameTopic( $oldWeb, $oldTopic, $newWeb, $newTopic, "relink" );
  	  if( $renameError ) {
! 	      TWiki::redirect( $query, &TWiki::getOopsUrl( $oldWeb, $oldTopic, "oopsrenameerr", $renameError, $newWeb, $newTopic ) );
  	      return;
             }
***************
*** 184,188 ****
               my $noAutoLink = 0;
  	     foreach( split( /\n/, $scantext ) ) {
! 	        next if( /^%META:TOPIC(INFO|MOVED)/ );
  		# FIXME This code is in far too many places - also in Search.pm and Store.pm
  		m|<pre>|i  && ( $insidePRE = 1 );
--- 184,191 ----
               my $noAutoLink = 0;
  	     foreach( split( /\n/, $scantext ) ) {
! 	        if( /^%META:TOPIC(INFO|MOVED)/ ) {
! 	            $resultText .= "$_\n";
! 	            next;
! 	        }
  		# FIXME This code is in far too many places - also in Search.pm and Store.pm
  		m|<pre>|i  && ( $insidePRE = 1 );