*** lib/TWiki/Render.pm.orig	Tue Jan  4 11:40:32 2005
--- lib/TWiki/Render.pm	Tue Jan  4 11:42:52 2005
***************
*** 192,205 ****
          my $date = $moved{"date"};
          $date = TWiki::formatTime( $date, "", "gmtime" );
          
          # Only allow put back if current web and topic match stored 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=\"$dispScriptUrlPath/rename$scriptSuffix/$web/$topic?newweb=$fromWeb&newtopic=$fromTopic&";
              $putBack .= "confirm=on\">put it back</a>";
          }
!         $text = "<i><nop>$to moved from <nop>$from on $date by $by </i>$putBack";
      }
      
      return $text;
--- 192,219 ----
          my $date = $moved{"date"};
          $date = TWiki::formatTime( $date, "", "gmtime" );
          
+ 	# TWiki:Codev/TopicMovedMessageTooVisible
+  	my $action = "";
+  	if( $fromWeb eq $toWeb ) {
+  	  $action = "renamed";
+  	} else {
+  	  $action = "moved";
+  	}
+ 
          # Only allow put back if current web and topic match stored 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=\"$dispScriptUrlPath/rename$scriptSuffix/$web/$topic?newweb=$fromWeb&newtopic=$fromTopic&";
+ 	    # TWiki:Codev/TopicMovedMessageTooVisible
+  	    if( $fromWeb eq $toWeb ) {
+  	      $putBack .= "confirm=on\">revert to its old name</a>";
+  	    } else {
+  	      $putBack .= "confirm=on\">put it back</a>";
+  	    }
              $putBack .= "confirm=on\">put it back</a>";
          }
!         $text = "<i><nop>$to $action from <nop>$from on $date by $by </i>$putBack";
      }
      
      return $text;