[TWiki-Dev] CVS: twiki/lib TWiki.pm,1.240,1.241

[Peter T. <pet...@us...>]

Update of /cvsroot/twiki/twiki/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv514

Modified Files:
	TWiki.pm 
Log Message:
Fix for Codev.IncorrectUrlRenderingInWebChanges

Index: TWiki.pm
===================================================================
RCS file: /cvsroot/twiki/twiki/lib/TWiki.pm,v
retrieving revision 1.240
retrieving revision 1.241
diff -C2 -r1.240 -r1.241
*** TWiki.pm	29 Sep 2003 01:15:31 -0000	1.240
--- TWiki.pm	19 Oct 2003 08:33:03 -0000	1.241
***************
*** 118,122 ****
  # ===========================
  # TWiki version:
! $wikiversion      = "28 Sep 2003";
  
  # ===========================
--- 118,122 ----
  # ===========================
  # TWiki version:
! $wikiversion      = "19 Oct 2003";
  
  # ===========================
***************
*** 1329,1342 ****
      if( $theLabel ) {
          # [[...][...]] link
!         if( $theLink =~ /^($webNameRegex|$defaultWebNameRegex)\./ ) {
!             return "[[$theLink][$theLabel]]";
          }
          return "[[$theWeb.$theLink][$theLabel]]";
  
      } else {
          # [[...]] link
!         if( $theLink =~ /^($webNameRegex|$defaultWebNameRegex)\./ ) {
!             return "[[$theLink]]";
          }
          return "[[$theWeb.$theLink][$theLink]]";
      }
--- 1329,1344 ----
      if( $theLabel ) {
          # [[...][...]] link
!         if( $theLink =~ /^($webNameRegex\.|$defaultWebNameRegex\.|$linkProtocolPattern\:)/ ) {
!             return "[[$theLink][$theLabel]]";  # no change
          }
+         # add 'Web.' prefix
          return "[[$theWeb.$theLink][$theLabel]]";
  
      } else {
          # [[...]] link
!         if( $theLink =~ /^($webNameRegex\.|$defaultWebNameRegex\.|$linkProtocolPattern\:)/ ) {
!             return "[[$theLink]]";  # no change
          }
+         # add 'Web.' prefix
          return "[[$theWeb.$theLink][$theLink]]";
      }