From a72500e23921b2b459eee331ae1a3faa8af91df5 Mon Sep 17 00:00:00 2001 From: Nahuel ANGELINETTI Date: Wed, 23 Sep 2009 14:56:44 +0200 Subject: [PATCH] (bug #3655) fix news language detection This patch improve the language detection for news in opac. If the user have no defined language in his browser. Mergefix --- opac/opac-main.pl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/opac/opac-main.pl b/opac/opac-main.pl index c4a44e98b8..721efcc767 100755 --- a/opac/opac-main.pl +++ b/opac/opac-main.pl @@ -48,9 +48,6 @@ $template->param( # display news # use cookie setting for language, bug default to syspref if it's not set -<<<<<<< HEAD:opac/opac-main.pl -my $news_lang = $input->cookie('KohaOpacLanguage') || 'en'; -======= (my $theme) = themelanguage(C4::Context->config('opachtdocs'),'opac-main.tmpl','opac',$input); my $translations = getTranslatedLanguages('opac',$theme); @@ -77,7 +74,6 @@ if($input->cookie('KohaOpacLanguage')){ $news_lang = $news_lang ? $news_lang : 'en' ; ->>>>>>> e25ac14... (bug #3655) fix news language detection:opac/opac-main.pl my $all_koha_news = &GetNewsToDisplay($news_lang); my $koha_news_count = scalar @$all_koha_news; -- 2.39.5