Item12888: fix unit test problems introduced in the last table-relate…

…d checkin
foswiki · Jun 4, 2015 · 97967b0 · 97967b0
1 parent aaa4355
commit 97967b0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/core/lib/Foswiki/Tables/Parser.pm b/core/lib/Foswiki/Tables/Parser.pm
@@ -17,7 +17,7 @@ package Foswiki::Tables::Parser;
 use strict;
 use Assert;
 
-use constant TRACE => 1;
+use constant TRACE => 0;
 
 BEGIN {
     if ( $Foswiki::cfg{UseLocale} ) {

diff --git a/core/lib/Foswiki/Tables/Reader.pm b/core/lib/Foswiki/Tables/Reader.pm
@@ -165,7 +165,7 @@ sub early_line {
     # Process generic (EDIT)?TABLE attributes.
     # There may be several on the line (yuck)
     my $ok = 0;
-    while ( $line =~ /%(TABLE|$this->{macro})(\{.*?\})?%/ ) {
+    while ( $line =~ /%(TABLE|$this->{macro})(\{.*?\})?%/s ) {
         $ok ||= $this->_early_line( $line, $1 );
     }
     push( @{ $this->{waiting} }, $line ) if $ok && length($line);

diff --git a/core/lib/Foswiki/Tables/Table.pm b/core/lib/Foswiki/Tables/Table.pm
@@ -181,7 +181,7 @@ sub makeConsistent {
 
     my $minRows = $this->getHeaderRows() + $this->getFooterRows();
     if ( $this->totalRows() < $minRows ) {
-        if ( $this->getHeaderRow() ) {
+        if ( $this->getHeaderRows() ) {
             while ( $this->totalRows() < $this->getHeaderRows() ) {
                 my @vals =
                   map { "*$_->{initial_value}*" } @{ $this->{colTypes} };