Fixed HTML output format bugs
authorJamie Cameron <jcameron@webmin.com>
Sun, 29 Apr 2007 19:33:07 +0000 (19:33 +0000)
committerJamie Cameron <jcameron@webmin.com>
Sun, 29 Apr 2007 19:33:07 +0000 (19:33 +0000)
postgresql/postgresql-lib.pl

index 1ce53b1..8158d2a 100644 (file)
@@ -424,9 +424,11 @@ else {
                                        push(@data, $row);
                                        $row = undef;
                                        }
-                               elsif ($line =~ /^\s*<(td|th)[^>]*>([^<]*)<\/(td|th)>/) {
+                               elsif ($line =~ /^\s*<(td|th)[^>]*>(.*)<\/(td|th)>/) {
                                        # Value in a row
-                                       push(@$row, &entities_to_ascii("$2"));
+                                       local $v = $2;
+                                       $v =~ s/<br>/\n/g;
+                                       push(@$row, &entities_to_ascii($v));
                                        }
                                }
                        $rv = { 'titles' => shift(@data),