@@ -, +, @@ --- C4/NewsChannels.pm | 4 ++-- .../mysql/atomicupdate/bug-14272-change-column-name-in-opac-news.sql | 1 + koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.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 +- 5 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug-14272-change-column-name-in-opac-news.sql --- a/C4/NewsChannels.pm +++ a/C4/NewsChannels.pm @@ -207,7 +207,7 @@ sub GetNewsToDisplay { FROM opac_news LEFT JOIN borrowers on borrowers.borrowernumber = opac_news.borrowernumber - WHERE (}; + WHERE }; if ( defined $id ) { $query .= q{ opac_news.idnew = ? } if defined $id; @@ -216,7 +216,7 @@ sub GetNewsToDisplay { unless ( defined $time ) { $query .= q{ AND } if defined $id; - $query .= q{ + $query .= q{ ( expirationdate >= CURRENT_DATE() OR expirationdate IS NULL OR expirationdate = '00-00-0000' --- a/installer/data/mysql/atomicupdate/bug-14272-change-column-name-in-opac-news.sql +++ a/installer/data/mysql/atomicupdate/bug-14272-change-column-name-in-opac-news.sql @@ -0,0 +1, @@ +ALTER TABLE opac_news CHANGE COLUMN `new` `content` text NOT NULL; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt @@ -183,7 +183,7 @@ [% SET newsdisp = Koha.Preference('NewsAuthorDisplay') %] [% FOREACH koha_new IN koha_news %]