From 20d6297aadaf627a1d4affa89d5a9d7838c680cf Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Tue, 24 Jan 2017 03:31:59 +0000 Subject: [PATCH] Bug 14272: [FOLLOW-UP] Show single news item This patch fixes merge conflicts, an error in the query, and changes the column name `new` to `content`. This patch is now ready to test. Sponsored-by: Catalyst IT --- C4/NewsChannels.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/C4/NewsChannels.pm b/C4/NewsChannels.pm index 5228804..d9463c7 100644 --- a/C4/NewsChannels.pm +++ b/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' -- 2.1.4