Patch for bug 270589: Make t/008filter.t accept empty template directives; patch...

diff --git a/t/008filter.t b/t/008filter.t
index 531edf28e27f90f5a91d4ced1cd90f5a4f323e60..bc8c6aa152a168d4287461c6dcfe5cf810950af0 100644 (file)
--- a/t/008filter.t
+++ b/t/008filter.t
@@ -158,6 +158,9 @@ sub directive_ok {
     $directive =~ s/^[+-]?\s*//;
     $directive =~ s/\s*[+-]?$//;
 
+    # Empty directives are ok; they are usually line break helpers
+    return 1 if $directive eq '';
+
     # Exclude those on the nofilter list
     if (defined($safe{$file}{$directive})) {
         $safe{$file}{$directive}++;

diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl
index f0267a6065a4d06d45226ee2c02a48ec70589aa0..d7b365ffcf412cf1343fd7a651ef94ad3c85ccc3 100644 (file)
--- a/template/en/default/filterexceptions.pl
+++ b/template/en/default/filterexceptions.pl
@@ -136,8 +136,6 @@
   'num_bugs',
   'data.$tbl.$col.$row',
   'title',
-  '', # This is not a bug in the filter exceptions - this template has an 
-      # empty directive which is necessary for it to work properly.
 ],
 
 'reports/report-table.html.tmpl' => [