*** EditTablePlugin.pm.old	Wed Feb 26 12:47:26 2003
--- EditTablePlugin.pm	Wed Feb 26 12:49:38 2003
***************
*** 291,296 ****
--- 291,299 ----
      # FIXME: *very* crude encoding to escape Wiki rendering inside form fields
      $theText =~ s/\./%dot%/gos;
      $theText =~ s/(.)/\.$1/gos;
+ 
+     # convert <br /> markup to unicode linebreak character for text areas
+     $theText =~ s/.<.b.r. .\/.>/&#10;/gos;
      return $theText;
  }
  
***************
*** 301,310 ****
  
      $theText =~ s/\.(.)/$1/gos;
      $theText =~ s/%dot%/\./gos;
!     $theText =~ s/\&([^a-z])/&amp;$1/go; # escape non-entities
!     $theText =~ s/</\&lt;/go;            # change < to entity
!     $theText =~ s/>/\&gt;/go;            # change > to entity
!     $theText =~ s/\"/\&quot;/go;         # change " to entity
  
      return $theText;
  }
--- 304,313 ----
  
      $theText =~ s/\.(.)/$1/gos;
      $theText =~ s/%dot%/\./gos;
!     $theText =~ s/\&([^#a-z])/&amp;$1/go; # escape non-entities
!     $theText =~ s/</\&lt;/go;             # change < to entity
!     $theText =~ s/>/\&gt;/go;             # change > to entity
!     $theText =~ s/\"/\&quot;/go;          # change " to entity
  
      return $theText;
  }
***************
*** 512,518 ****
              $cellDefined = 0;
              $val = $query->param( "etcell${theRowNr}x$col" );
              if( defined $val ) {
!                 $val =~ s/[\n\r]/ /gos;  # Netscape on Unix can have new lines in an edit field
                  $cellDefined = 1;
                  $cell = $val;
              } elsif( $col <= @cells ) {
--- 515,522 ----
              $cellDefined = 0;
              $val = $query->param( "etcell${theRowNr}x$col" );
              if( defined $val ) {
! 		# change any new line character sequences to <br />
!                 $val =~ s/(\n\r?)|(\r\n?)+/<br \/>/gos;
                  $cellDefined = 1;
                  $cell = $val;
              } elsif( $col <= @cells ) {