*** EditTablePlugin.pm-orig	Tue Oct 14 00:36:30 2003
--- EditTablePlugin.pm	Tue Oct 14 00:15:09 2003
***************
*** 453,465 ****
      my $sel  = "";
      my $style = " style='background:#e8e8e8'" if ($theRowNr % 2);
      if( $type eq "select" ) {
          $size = 1 if $size < 1;
          $text = "<select$style name=\"$theName\" size=\"$size\">";
          $i = 2;
          while( $i < @bits ) {
              $val  = $bits[$i] || "";
              $valExpansed  = $bitsExpansed[$i] || "";
!             if( $valExpansed eq $theValue ) {
                  $text .= " <option selected=\"selected\">$val</option>";
              } else {
                  $text .= " <option>$val</option>";
--- 453,466 ----
      my $sel  = "";
      my $style = " style='background:#e8e8e8'" if ($theRowNr % 2);
      if( $type eq "select" ) {
+         my $expansedValue = &TWiki::Func::expandCommonVariables( $theValue, $theTopic, $theWeb );
          $size = 1 if $size < 1;
          $text = "<select$style name=\"$theName\" size=\"$size\">";
          $i = 2;
          while( $i < @bits ) {
              $val  = $bits[$i] || "";
              $valExpansed  = $bitsExpansed[$i] || "";
!             if( $valExpansed eq $expansedValue ) {
                  $text .= " <option selected=\"selected\">$val</option>";
              } else {
                  $text .= " <option>$val</option>";
***************
*** 534,540 ****
                  $val =~ s/(\n\r?)|(\r\n?)+/<br \/>/gos;
                  $cellDefined = 1;
  		# Expanse %-vars
!                 $cell = &TWiki::Func::expandCommonVariables( $val, $theTopic, $theWeb );
              } elsif( $col <= @cells ) {
                  $cell = $cells[$col-1];
                  $cellDefined = 1 if( length( $cell ) > 0 );
--- 535,541 ----
                  $val =~ s/(\n\r?)|(\r\n?)+/<br \/>/gos;
                  $cellDefined = 1;
  		# Expanse %-vars
!                 $cell = $val;
              } elsif( $col <= @cells ) {
                  $cell = $cells[$col-1];
                  $cellDefined = 1 if( length( $cell ) > 0 );