From ae5b98020aeec7d56faa7170cbad3319a8245379 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 1 Sep 2015 08:55:10 +0100
Subject: [PATCH] Bug 13618: Fix for news
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Signed-off-by: Joonas Kylmälä <j.kylmala@gmail.com>

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
---
 koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt      | 2 +-
 .../prog/en/modules/members/moremember-receipt.tt             | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt    | 4 ++--
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt         | 2 +-
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-news-rss.tt     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
index 37f2768643..90c0b6a165 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
@@ -174,7 +174,7 @@
             [% SET newsdisp = Koha.Preference('NewsAuthorDisplay') %]
             [% FOREACH koha_new IN koha_news %]
                 <div class="newsitem" id="news[% koha_new.idnew %]"><h4>[% koha_new.title %]</h4>
-                    <p>[% koha_new.new %]</p>
+                    <p>[% koha_new.new.raw %]</p>
                     <p class="newsfooter"> Posted on [% koha_new.newdate %][% IF( ( newsdisp == 'staff' || newsdisp == 'both' ) && koha_new.borrowernumber ) %] by <span class="newsauthor_title">[% koha_new.author_title %] </span>[% koha_new.author_firstname %] [% koha_new.author_surname %]<br />[% END %]
                         [% IF ( CAN_user_tools ) %]
                             <a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% koha_new.idnew %]">Edit</a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
index f57053aede..81ae05b60f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tt
@@ -61,7 +61,7 @@ Date due: [% issueloo.date_due %]</p>
                        <!-- [% koha_news_count %] recent news item(s) -->
             [% FOREACH koha_new IN koha_news %]
                     <div class="newsitem" id="news[% koha_new.idnew %]"><h5 style="margin-bottom: 1px; margin-top: 1px"><b>[% koha_new.title %]</b></h5>
-                                        <p style="margin-bottom: 1px; margin-top: 1px">[% koha_new.new %]</p>
+                                        <p style="margin-bottom: 1px; margin-top: 1px">[% koha_new.new.raw %]</p>
                                        <p class="newsfooter" style="font-size: 8pt; font-style:italic; margin-bottom: 1px; margin-top: 1px"> Posted on [% koha_new.newdate %]
 
 </p><hr /></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
index 38a3598f76..21bec0726f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tt
@@ -145,7 +145,7 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div>
                 [% END %]
             </li>
             <li><label for="new">News: </label>
-            <textarea name="new" id="new"  cols="75" rows="10">[% new_detail.new %]</textarea>
+            <textarea name="new" id="new"  cols="75" rows="10">[% new_detail.new.raw %]</textarea>
             </li>
             </ol>
 			</fieldset>
@@ -247,7 +247,7 @@ Edit news item[% ELSE %]Add news item[% END %][% ELSE %]News[% END %]</div>
                             <td>[% opac_new.title %]</td>
                             <td>[% opac_new.author_title %] [% opac_new.author_firstname %] [% opac_new.author_surname %]</td>
                            <td>
-                                [% opac_new.new %]
+                                [% opac_new.new.raw %]
                             </td>
                             <td><a href="/cgi-bin/koha/tools/koha-news.pl?op=add_form&amp;id=[% opac_new.idnew %]">Edit</a></td>
                         </tr>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
index c7dec28fc6..467dbe637d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt
@@ -44,7 +44,7 @@
                 [% FOREACH koha_new IN koha_news %]
                     <div class="newsitem">
                         <a name="newsitem[% koha_new.idnew %]"></a><h4 class="newsheader">[% koha_new.title %]</h4>
-                        <div class="newsbody">[% koha_new.new %]</div>
+                        <div class="newsbody">[% koha_new.new.raw %]</div>
                         <div class="newsfooter">(published on [% koha_new.newdate %][% IF ( (newsdisp == 'opac' || newsdisp == 'both') && koha_new.borrowernumber ) %] by <span class="newsauthor_title">[% koha_new.author_title %] </span>[% koha_new.author_firstname %] [% koha_new.author_surname %][% END %])</div>
                     </div>
                 [% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-news-rss.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-news-rss.tt
index 6bdb1e47da..806fd04e58 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-news-rss.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-news-rss.tt
@@ -8,7 +8,7 @@
       [% FOREACH newsitem IN koha_news %]
       <item>
         <title>[% newsitem.title %]</title>
-        <description>[% newsitem.new %]</description>
+        <description>[% newsitem.new.raw %]</description>
         <guid>[% OPACBaseURL %]/cgi-bin/koha/opac-main.pl#newsitem[% newsitem.idnew %]</guid>
       </item>
       [% END %]
-- 
2.39.5