Bug 21947: Address other misordered FILTER lines

As per comment #3, this patch changes the order for all
the filters found with the recommended git grep.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit 30874dea519d379134174cf9c5fd5051588a8629)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index cb2182a..bfab772 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -633,7 +633,7 @@
         [% IF MARCNOTE.marcnote.match('^https?://\S+$') %]
             <a href="[% MARCNOTE.marcnote | url %]">[% MARCNOTE.marcnote | html %]</a>
         [% ELSE %]
-            [% MARCNOTE.marcnote FILTER html_line_break | html %]
+            [% MARCNOTE.marcnote | html | html_line_break %]
         [% END %]
         </p>
     [% END %]
@@ -659,7 +659,7 @@
             [% END %]
             [% IF ( subscription.closed ) %]<p>This subscription is closed.</p>[% END %]
             [% IF ( subscription.callnumber ) %]<p>Callnumber: [% subscription.callnumber | html %] </p>[% END %]
-            [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes FILTER html_line_break | html %] </p>[% END %]
+            [% IF ( subscription.subscriptionnotes ) %]<p>[% subscription.subscriptionnotes | html | html_line_break %] </p>[% END %]
             [% IF ( subscription.missinglist ) %]<p>Missing issues: [% subscription.missinglist | html %] </p>[% END %]
             [% IF ( subscription.librariannote ) %]<p>([% subscription.librariannote | html %])</p>[% END %]
             [% IF ( subscription.latestserials ) %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
index a26d5f0..84bd455 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
@@ -44,7 +44,7 @@
                <td>
             <a class="notice-title" data-noticeid="[% QUEUED_MESSAGE.message_id | html %]" href="#">[% QUEUED_MESSAGE.subject | html %]</a>
             <div id="notice[% QUEUED_MESSAGE.message_id | html %]" class="notice">
-                <iframe srcdoc="[% QUEUED_MESSAGE.content FILTER html_line_break | html %]"></iframe>
+                <iframe srcdoc="[% QUEUED_MESSAGE.content | html | html_line_break %]"></iframe>
             </div>
         </td>
                <td>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
index 5d935e9..9f14fbb 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -336,10 +336,10 @@
             <li><span class="label">History end date:</span> [% histenddate | html %]</li>
             <li><span class="label">Received issues:</span>[% recievedlist | html %]</li>
             <li><span class="label">Missing issues:</span>[% missinglist | html %]</li>
-            <li><span class="label">Nonpublic note:</span>[% internalnotes FILTER html_line_break | html %]</li>
-            <li><span class="label">Public note:</span>[% notes FILTER html_line_break | html %]</li>
-            <li><span class="label">History staff note:</span>[% librariannote FILTER html_line_break | html %]</li>
-            <li><span class="label">History OPAC note:</span>[% opacnote FILTER html_line_break | html %]</li>
+            <li><span class="label">Nonpublic note:</span>[% internalnotes | html | html_line_break %]</li>
+            <li><span class="label">Public note:</span>[% notes | html | html_line_break %]</li>
+            <li><span class="label">History staff note:</span>[% librariannote | html | html_line_break %]</li>
+            <li><span class="label">History OPAC note:</span>[% opacnote | html | html_line_break %]</li>
         </ol>
     </div>
     </div>

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
index 331d307..4c3641b 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -811,7 +811,7 @@
                                   <p class="subscription_callnumber">Call number: [% subscription.callnumber | html %]</p>
                                 [% END %]
                                 [% IF ( subscription.subscriptionnotes ) %]
-                                    <p class="subscription_notes">[% subscription.subscriptionnotes FILTER html_line_break | html %] </p>
+                                    <p class="subscription_notes">[% subscription.subscriptionnotes | html | html_line_break %] </p>
                                 [% END %]
                                 <p class="subscription_dates">Subscription from: [% subscription.histstartdate | $KohaDates %] to:[% IF ( subscription.histenddate ) %] [% subscription.histenddate | $KohaDates %] [% ELSE %] now (current)[% END %]</p>
                                 [% IF ( subscription.letter ) %]<span class="email_notifications">
@@ -829,7 +829,7 @@
                                     <p class="subscription_missing">Missing issues: [% subscription.missinglist | html %] </p>
                                 [% END %]
                                 [% IF ( subscription.opacnote ) %]
-                                    <p class="subscription_opacnote">[% subscription.opacnote FILTER html_line_break | html %]</p>
+                                    <p class="subscription_opacnote">[% subscription.opacnote | html | html_line_break %]</p>
                                 [% END %]
                                 [% IF ( subscription.latestserials ) %]
                                     <p class="subscription_latestissues"> The [% subscription.opacdisplaycount | html %] latest issues for this subscription:</p>

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
index 9733a32..c416dab 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-serial-issues.tt
@@ -115,7 +115,7 @@
                                     <h4>[% subscription_LOO.branchname | html %]</h4>
 
                                     [% IF ( subscription_LOO.notes ) %]
-                                        <p>[% subscription_LOO.notes FILTER html_line_break | html %]</p>
+                                        <p>[% subscription_LOO.notes | html | html_line_break %]</p>
                                     [% END %]
 
                                     [% IF ( subscription_LOO.recievedlist ) %]
@@ -131,7 +131,7 @@
                                     [% IF ( subscription_LOO.opacnote ) %]
                                         <h5>Issues summary</h5>
                                         <p>
-                                            [% subscription_LOO.opacnote FILTER html_line_break | html %]
+                                            [% subscription_LOO.opacnote | html | html_line_break %]
                                         </p>
                                     [% END %]
                                     [% IF ( subscription_LOO.letter ) %]