*** lib/TWiki.pm.orig	Fri Jun  6 09:07:43 2003
--- lib/TWiki.pm	Fri Jun  6 09:16:46 2003
***************
*** 2109,2121 ****
          $date = formatGmTime( $date );
          
          # Only allow put back, if current web and topic match stored to information
          my $putBack = "";
          if( $web eq $toWeb && $topic eq $toTopic ) {
              $putBack  = " - <a title=\"Click to move topic back to previous location, with option to change references.\"";
              $putBack .= " href=\"$scriptUrlPath/rename/$web/$topic?newweb=$fromWeb&newtopic=$fromTopic&";
!             $putBack .= "confirm=on\">put it back</a>";
          }
!         $text = "<p><i><nop>$to moved from <nop>$from on $date by $by </i>$putBack</p>";
      }
      
      $text = handleCommonTags( $text, $topic, $web );
--- 2109,2131 ----
          $date = formatGmTime( $date );
          
          # Only allow put back, if current web and topic match stored to information
+ 	my $action = "";
+ 	if( $fromWeb eq $toWeb ) {
+ 	  $action = "renamed";
+ 	} else {
+ 	  $action = "moved";
+ 	}
          my $putBack = "";
          if( $web eq $toWeb && $topic eq $toTopic ) {
              $putBack  = " - <a title=\"Click to move topic back to previous location, with option to change references.\"";
              $putBack .= " href=\"$scriptUrlPath/rename/$web/$topic?newweb=$fromWeb&newtopic=$fromTopic&";
! 	    if( $fromWeb eq $toWeb ) {
! 	      $putBack .= "confirm=on\">revert to its old name</a>";
! 	    } else {
! 	      $putBack .= "confirm=on\">put it back</a>";
! 	    }
          }
!         $text = "<p><i><nop>$to $action from <nop>$from on $date by $by </i>$putBack</p>";
      }
      
      $text = handleCommonTags( $text, $topic, $web );