Bug 27650: Fix variable passed to the template in opac-main
$template->param( + koha_news => @all_koha_news, We must not pass an array, the number of elements of the hash passed to the template may be inconsistent. It's working because of an error earlier in the script: + @all_koha_news = &GetNewsToDisplay($news_lang,$homebranch); GetNewsToDisplay returns an arrayref Test plan: Define at least 2 news to display on the OPAC main page Hit opac-main.pl => All news are displayed Click one => You see the single news you selected Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> (cherry picked from commitca4ef19a2b) Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com> (cherry picked from commitaf888cd3b8) Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
This commit is contained in:
parent
632f4600e0
commit
fbc96a7d31
|
|
@ -60,17 +60,17 @@ elsif (C4::Context->userenv and defined $input->param('branch') and length $inpu
|
|||
}
|
||||
|
||||
my $news_id = $input->param('news_id');
|
||||
my @all_koha_news;
|
||||
my $all_koha_news;
|
||||
|
||||
if (defined $news_id){
|
||||
@all_koha_news = Koha::News->search({ idnew => $news_id, lang => { '!=', 'koha' } }); # get news that is not staff-only news
|
||||
if( @all_koha_news ) { # we only expect one btw
|
||||
$template->param( news_item => $all_koha_news[0] );
|
||||
$all_koha_news = Koha::News->search({ idnew => $news_id, lang => { '!=', 'koha' } }); # get news that is not staff-only news
|
||||
if( $all_koha_news->count ) { # we only expect one btw
|
||||
$template->param( news_item => $all_koha_news->next );
|
||||
} else {
|
||||
$template->param( single_news_error => 1 );
|
||||
}
|
||||
} else {
|
||||
@all_koha_news = &GetNewsToDisplay( $template->lang, $homebranch);
|
||||
$all_koha_news = &GetNewsToDisplay( $template->lang, $homebranch);
|
||||
}
|
||||
|
||||
my $quote = GetDailyQuote(); # other options are to pass in an exact quote id or select a random quote each pass... see perldoc C4::Koha
|
||||
|
|
@ -99,7 +99,7 @@ if ( $patron ) {
|
|||
}
|
||||
|
||||
$template->param(
|
||||
koha_news => @all_koha_news,
|
||||
koha_news => $all_koha_news,
|
||||
branchcode => $homebranch,
|
||||
display_daily_quote => C4::Context->preference('QuoteOfTheDay'),
|
||||
daily_quote => $quote,
|
||||
|
|
|
|||
Loading…
Reference in New Issue