Patch for bug 326060: Remove template check for flag.setter (it always exists) -...

diff --git a/template/en/default/attachment/list.html.tmpl b/template/en/default/attachment/list.html.tmpl
index 8734487a6e1aecf1931798a06da74913012adc6c..03368ce26d16fdd5081946adf08fb9fbb8fe2b05 100644 (file)
--- a/template/en/default/attachment/list.html.tmpl
+++ b/template/en/default/attachment/list.html.tmpl
@@ -64,9 +64,7 @@
               <i>none</i>
             [% ELSE %]
               [% FOREACH flag = attachment.flags %]
-                [% IF flag.setter %]
-                  [% flag.setter.nick FILTER html %]:
-                [% END %]
+                [% flag.setter.nick FILTER html %]:
                 [%+ flag.type.name FILTER html FILTER no_break %][% flag.status %]
                 [%+ IF flag.status == "?" && flag.requestee %]
                   ([% flag.requestee.nick FILTER html %])

diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl
index e2c918dbb6154448e2a3598749286ea7b71eac1d..06cea8683d6fb4e5459aa06b04120e92d0db0994 100644 (file)
--- a/template/en/default/attachment/show-multiple.html.tmpl
+++ b/template/en/default/attachment/show-multiple.html.tmpl
@@ -65,9 +65,7 @@
           <i>no flags</i>
         [% ELSE %]
           [% FOREACH flag = a.flags %]
-            [% IF flag.setter %]
-              [% flag.setter.nick FILTER html %]:
-            [% END %]
+            [% flag.setter.nick FILTER html %]:
             [%+ flag.type.name FILTER html %][% flag.status %]
             [% IF flag.status == "?" && flag.requestee %]
               ([% flag.requestee.nick FILTER html %])

diff --git a/template/en/default/bug/show.xml.tmpl b/template/en/default/bug/show.xml.tmpl
index 6fe3f3180cd0a977e26dfb8bf17c80ac1f42e3e6..27fa175da93f902db41335acd244ecd604d0df42 100644 (file)
--- a/template/en/default/bug/show.xml.tmpl
+++ b/template/en/default/bug/show.xml.tmpl
@@ -94,9 +94,7 @@
             [% FOREACH flag = a.flags %]
               <flag name="[% flag.type.name FILTER xml %]"
                     status="[% flag.status FILTER xml %]"
-                    [% IF flag.setter %]
-                      setter="[% flag.setter.email FILTER xml %]"
-                    [% END %]
+                    setter="[% flag.setter.email FILTER xml %]"
                     [% IF flag.status == "?" && flag.requestee %]
                       requestee="[% flag.requestee.email FILTER xml %]"
                     [% END %]