From 917ec3700ee2694333219b21d5f16d7c2b147254 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Thu, 19 Jul 2018 18:47:46 -0300
Subject: [PATCH] Bug 13618: Manually replace missing .raw

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

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 .../intranet-tmpl/prog/en/includes/doc-head-close.inc     | 2 +-
 .../intranet-tmpl/prog/en/includes/intranet-bottom.inc    | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/popup-bottom.inc | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt | 2 +-
 .../prog/en/modules/authorities/authorities.tt            | 2 +-
 .../intranet-tmpl/prog/en/modules/cataloguing/additem.tt  | 2 +-
 .../intranet-tmpl/prog/en/modules/circ/circulation.tt     | 6 +++---
 .../intranet-tmpl/prog/en/modules/circ/pendingreserves.tt | 2 +-
 .../intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt | 2 +-
 .../intranet-tmpl/prog/en/modules/members/boraccount.tt   | 2 +-
 .../prog/en/modules/members/tables/guarantor_search.tt    | 2 +-
 .../prog/en/modules/members/tables/members_results.tt     | 2 +-
 .../prog/en/modules/reports/guided_reports_start.tt       | 2 +-
 .../intranet-tmpl/prog/en/modules/reports/itemslost.tt    | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/includes/bodytag.inc     | 8 ++++----
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt   | 8 ++++----
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt  | 2 +-
 .../opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt     | 2 +-
 18 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
index 8be66b2804..c8d268015e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
@@ -18,7 +18,7 @@
 [% Asset.css("lib/font-awesome/css/font-awesome.min.css") | $raw %]
 [% Asset.css("css/print.css", { media = "print" }) | $raw %]
 [% INCLUDE intranetstylesheet.inc %]
-[% IF ( bidi ) %][% Asset.css("css/right-to-left.css").raw %][% END %]
+[% IF ( bidi ) %][% Asset.css("css/right-to-left.css") | $raw %][% END %]
 
 [% IF ( login ) %]
     [% Asset.css("css/login.css") | $raw %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
index 89619a01b1..022c4e33a2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc
@@ -69,7 +69,7 @@
     <span id="audio-alert"></span>
     [% IF ( footerjs ) %]
         [% INCLUDE js_includes.inc %]
-        [% jsinclude.raw # Parse the page template's JavaScript block if necessary %]
+        [% jsinclude | $raw # Parse the page template's JavaScript block if necessary %]
     [% END %]
     </body>
 </html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/popup-bottom.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/popup-bottom.inc
index 7fd95b948a..9a113d4cec 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/popup-bottom.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/popup-bottom.inc
@@ -1,7 +1,7 @@
 [% USE raw %]
     [% IF ( footerjs ) %]
         [% INCLUDE js_includes.inc popup=1 %]
-        [% jsinclude.raw # Parse the page template's JavaScript block if necessary %]
+        [% jsinclude | $raw # Parse the page template's JavaScript block if necessary %]
     [% END %]
 </body>
 </html>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
index 8de52996d2..09a44d9147 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tt
@@ -244,7 +244,7 @@
         }
 
         $(document).ready(function() {
-            columns_settings = [% ColumnsSettings.GetColumns( 'admin', 'currency', 'currencies-table', 'json' ).raw %]
+            columns_settings = [% ColumnsSettings.GetColumns( 'admin', 'currency', 'currencies-table', 'json' ) | $raw %]
             var issuest = KohaTable("currencies-table", {
                 dom: 'B<"clearfix">t',
                 "columnDefs": [
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
index e61faa339a..032761fc14 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
@@ -65,7 +65,7 @@ function AreMandatoriesNotOk(){
     		[% FOREACH subfield_loo IN innerloo.subfield_loop %]
     			[% IF ( subfield_loo.mandatory ) %]mandatories.push("[% subfield_loo.id | html %]");
                     tab.push("[% BIG_LOO.number | html %]");
-                    label.push("[% subfield_loo.marc_lib.raw |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]");
+                    label.push("[% subfield_loo.marc_lib | $raw |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]");
     			[% END %]
 			[% END %]
 		[% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
index 38e8fcdd3e..8f14152e89 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
@@ -303,7 +303,7 @@ function confirm_deletion() {
                         [% ELSE  %]
                             <a href="#" id="buttonDot_[%- mv.id | html -%]" class="[%- mv.class | html -%]" title="Tag editor">...</a>
                         [% END %]
-                        [%- mv.javascript.raw -%]
+                        [%- mv.javascript | $raw -%]
                     [% END %]
                 [% ELSIF ( mv.type == 'text' ) %]
                     [% IF mv.readonly %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 6cdc633bf6..c345a264fa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -693,9 +693,9 @@ No patron matched <span class="ex">[% message | html %]</span>
                    [% IF ( debarredcomment ) %]
                        with the explanation: <br/><i>
                        [% IF debarredcomment.search('OVERDUES_PROCESS') %]
-                           Restriction added by overdues process [% debarredcomment.remove('OVERDUES_PROCESS ').raw | html_line_break %]
+                           Restriction added by overdues process [% debarredcomment.remove('OVERDUES_PROCESS ') | raw | html_line_break %]
                        [% ELSE %]
-                           [% debarredcomment.raw | html_line_break %]
+                           [% debarredcomment | raw | html_line_break %]
                        [% END %]
                        </i>
                    [% END %]
@@ -1004,7 +1004,7 @@ No patron matched <span class="ex">[% message | html %]</span>
         var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
         var MSG_CONFIRM_DELETE_MESSAGE = _("Are you sure you want to delete this message? This cannot be undone.");
 
-        columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ).raw %]
+        columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %]
 
         [% IF borrowernumber and patron %]
             if($.cookie("holdfor") != [% patron.borrowernumber | html %]){
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
index 137deea951..c6c71197cd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt
@@ -204,7 +204,7 @@
     [% INCLUDE 'columns_settings.inc' %]
     <script type="text/javascript">
         $(document).ready(function() {
-          var columns_settings = [% ColumnsSettings.GetColumns('circ', 'holds', 'holds-to-pull', 'json').raw %];
+          var columns_settings = [% ColumnsSettings.GetColumns('circ', 'holds', 'holds-to-pull', 'json') | $raw %];
           var holdst = KohaTable("holdst", {
             "aoColumnDefs": [
                 { "sType": "anti-the", "aTargets" : [ "anti-the" ] },
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
index e8d2588b27..e2bb802897 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
@@ -216,7 +216,7 @@
             };
             $('#holdst thead input').on('change keyup keydown', filterColumn);
 
-            var columns_settings = [% ColumnsSettings.GetColumns('circ', 'view_holdsqueue', 'holds-table', 'json').raw %];
+            var columns_settings = [% ColumnsSettings.GetColumns('circ', 'view_holdsqueue', 'holds-table', 'json') | $raw %];
             var holdst = KohaTable("holdst", {
                 "aaSorting": [[ 3, "asc" ]],
                 "aoColumns": [
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
index 283ef72cdf..1f64b17b90 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
@@ -123,7 +123,7 @@
         $(document).ready(function() {
             var txtActivefilter = _("Filter paid transactions");
             var txtInactivefilter = _("Show all transactions");
-            var columns_settings = [% ColumnsSettings.GetColumns('members', 'fines', 'account-fines', 'json').raw %];
+            var columns_settings = [% ColumnsSettings.GetColumns('members', 'fines', 'account-fines', 'json') | $raw %];
             var table_account_fines = KohaTable("table_account_fines", {
                 "sPaginationType": "four_button",
                 'aaSorting': [[0, 'desc']],
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt
index 11d971e846..a82f0e8dcb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt
@@ -32,5 +32,5 @@
 [%~ IF data.zipcode %][% SET address = address _ data.zipcode _ ' ' %][% END %]
 [%~ IF data.country %][% SET address = address _ data.country _ ' ' %][% END %]
 [%~ SET address = address _ Branches.GetName( data.branchcode ) %]
-[%~ To.json( address ).raw ~%]
+[%~ To.json( address ) | $raw ~%]
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt
index db1a9ff14f..6799c31032 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt
@@ -45,5 +45,5 @@
 [%~ IF data.streettype %][% address = address _ AuthorisedValues.GetByCode( 'ROADTYPE', data.streettype ) _ ' ' | html %][% END %]
 [%~ IF data.address %][% address = address _ data.address _ ' ' | html %][% END %]
 [%~ IF data.address2 %][% address = address _ data.address2 _ ' ' | html %][% END %]
-[%~ To.json( address ).raw ~%]
+[%~ To.json( address ) | $raw ~%]
 [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index 5cd4e2178b..cbb9e9b6d5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -971,7 +971,7 @@ $(document).ready(function() {
         $(document).ready(function(){
 
             $('[data-toggle="tooltip"]').tooltip();
-            var columns_settings = [% ColumnsSettings.GetColumns( 'reports', 'saved-sql', 'table_reports', 'json' ).raw %];
+            var columns_settings = [% ColumnsSettings.GetColumns( 'reports', 'saved-sql', 'table_reports', 'json' ) | $raw %];
 
             $('#limit').change(function() {
                 $('#limitselect').submit();
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
index 93ce0ba3a8..b4c741b130 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt
@@ -189,7 +189,7 @@
     [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
     <script type='text/javascript'>
         $(document).ready(function() {
-            var columns_settings = [% ColumnsSettings.GetColumns( 'reports', 'lostitems', 'lostitems-table', 'json' ).raw %];
+            var columns_settings = [% ColumnsSettings.GetColumns( 'reports', 'lostitems', 'lostitems-table', 'json' ) | $raw %];
             var lostitems_table = KohaTable("lostitems-table", {
                 "dom": 'B<"clearfix">t',
                 "aaSorting": [],
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/bodytag.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/bodytag.inc
index 75c67fc4ed..fdc389e3b3 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/bodytag.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/bodytag.inc
@@ -1,14 +1,14 @@
 [% USE raw %]
 [% classprop  = 'class="' | html %]
 [% IF LoginBranchcode.defined %]
-    [% classprop = classprop.raw _ 'branch-' _ LoginBranchcode %]
+    [% classprop = classprop | $raw _ 'branch-' _ LoginBranchcode %]
 [% ELSE %]
-    [% classprop = classprop.raw _ 'branch-default' %]
+    [% classprop = classprop | $raw _ 'branch-default' %]
 [% END %]
 [% IF bodyclass.defined %]
-    [% classprop = classprop.raw _ ' ' _ bodyclass %]
+    [% classprop = classprop | $raw _ ' ' _ bodyclass %]
 [% END %]
-[% classprop = classprop.raw _ '"' %]
+[% classprop = classprop | $raw _ '"' %]
 
 [% IF bodyid.defined %]
     [% idprop = 'ID="' _ bodyid _ '" ' | html %]
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 ac51ea5431..5c51764a59 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -31,7 +31,7 @@
 <title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo; Details for: [% title | html %][% FOREACH subtitl IN subtitle %][% IF Koha.Preference('marcflavour')=='UNIMARC' %],[% END %] [% subtitl.subfield | html %][% END %]</title>
 [% INCLUDE 'doc-head-close.inc' %]
 [% IF ( bidi ) %]
-  [% BLOCK cssinclude %][% Asset.css("css/right-to-left.css").raw %][% END %]
+  [% BLOCK cssinclude %][% Asset.css("css/right-to-left.css") | $raw %][% END %]
 [% END %]
 [% IF ( OpacStarRatings != 'disable' ) %]
     [% BLOCK cssinclude %][% Asset.css("css/jquery.rating.css") | $raw %][% END %]
@@ -1363,7 +1363,7 @@
 [% END %]
 [% IF ( OpacStarRatings != 'disable' ) %][% Asset.js("lib/jquery/plugins/jquery.rating.js") | $raw %][% END %]
 
-[% IF ( OpacHighlightedWords ) %][% Asset.js("lib/jquery/plugins/jquery.highlight-3.js").raw %][% END %]
+[% IF ( OpacHighlightedWords ) %][% Asset.js("lib/jquery/plugins/jquery.highlight-3.js") | $raw %][% END %]
 
 <script>
 //<![CDATA[
@@ -1420,7 +1420,7 @@
             }
         });
 
-        var columns_settings = [% ColumnsSettings.GetColumns( 'opac', 'biblio-detail', 'holdingst', 'json' ).raw %];
+        var columns_settings = [% ColumnsSettings.GetColumns( 'opac', 'biblio-detail', 'holdingst', 'json' ) | $raw ];
 
         KohaTable("#holdingst", {
             dom: '<"clearfix">t',
@@ -1440,7 +1440,7 @@
             "bKohaColumnsUseNames": true
         }, columns_settings);
 
-        var serial_column_settings = [% ColumnsSettings.GetColumns( 'opac', 'biblio-detail', 'subscriptionst', 'json' ).raw %];
+        var serial_column_settings = [% ColumnsSettings.GetColumns( 'opac', 'biblio-detail', 'subscriptionst', 'json' ) | $raw %];
 
         KohaTable("#subscriptionst", {
             dom: '<"clearfix">t',
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
index e71e9de1e6..e711428fa0 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
@@ -592,7 +592,7 @@
 [% IF ( OverDriveEnabled ) %][% Asset.js("js/overdrive.js") | $raw %][% END %]
 [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
 [% Asset.js("js/authtoresults.js") | $raw %]
-[% IF ( OpacHighlightedWords ) %][% Asset.js("lib/jquery/plugins/jquery.highlight-3.js").raw %]
+[% IF ( OpacHighlightedWords ) %][% Asset.js("lib/jquery/plugins/jquery.highlight-3.js") | $raw %]
 [% END %]<script>
 //<![CDATA[
 [% IF ( Koha.Preference( 'opacuserlogin' ) == 1 ) && ( Koha.Preference( 'RequestOnOpac' ) == 1 ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt
index 8f9a98ab41..3c53c3b40a 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-sendbasket.tt
@@ -40,7 +40,7 @@ Your cart
             <span>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author | $raw %][% END %]
 
             [% IF ( BIBLIO_RESULT.MARCAUTHORS ) %]
-                [% IF ( BIBLIO_RESULT.author.raw ) %]; [% END %]
+                [% IF ( BIBLIO_RESULT.author | $raw ) %]; [% END %]
                 [% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %]
                     [% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %]
                         [% MARCAUTHOR_SUBFIELDS_LOO.separator | $raw %][% MARCAUTHOR_SUBFIELDS_LOO.value | $raw %]
-- 
2.39.5