View | Details | Raw Unified | Return to bug 14272
Collapse All | Expand All

(-)a/C4/NewsChannels.pm (-2 / +2 lines)
Lines 207-213 sub GetNewsToDisplay { Link Here
207
     FROM opac_news
207
     FROM opac_news
208
     LEFT JOIN borrowers on borrowers.borrowernumber =
208
     LEFT JOIN borrowers on borrowers.borrowernumber =
209
         opac_news.borrowernumber
209
         opac_news.borrowernumber
210
     WHERE (};
210
     WHERE };
211
211
212
    if ( defined $id ) {
212
    if ( defined $id ) {
213
        $query .= q{ opac_news.idnew = ? } if defined $id;
213
        $query .= q{ opac_news.idnew = ? } if defined $id;
Lines 216-222 sub GetNewsToDisplay { Link Here
216
216
217
    unless ( defined $time ) {
217
    unless ( defined $time ) {
218
        $query .= q{ AND } if defined $id;
218
        $query .= q{ AND } if defined $id;
219
        $query .= q{
219
        $query .= q{ (
220
            expirationdate >= CURRENT_DATE()
220
            expirationdate >= CURRENT_DATE()
221
            OR    expirationdate IS NULL
221
            OR    expirationdate IS NULL
222
            OR    expirationdate = '00-00-0000'
222
            OR    expirationdate = '00-00-0000'
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt (-2 / +1 lines)
Lines 68-74 Link Here
68
                [% FOREACH koha_new IN koha_news %]
68
                [% FOREACH koha_new IN koha_news %]
69
                    <div class="newsitem">
69
                    <div class="newsitem">
70
                        <a name="newsitem[% koha_new.idnew %]" href="/cgi-bin/koha/opac-main.pl?news_id=[% koha_new.idnew %]"><h4 class="newsheader">[% koha_new.title %]</h4></a>
70
                        <a name="newsitem[% koha_new.idnew %]" href="/cgi-bin/koha/opac-main.pl?news_id=[% koha_new.idnew %]"><h4 class="newsheader">[% koha_new.title %]</h4></a>
71
                        <div class="newsbody">[% koha_new.new %]</div>
71
                        <div class="newsbody">[% koha_new.content %]</div>
72
                        <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>
72
                        <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>
73
                    </div>
73
                    </div>
74
                [% END %]
74
                [% END %]
75
- 

Return to bug 14272