Disregard this patch. Corrected version to follow.
On Thu, Jan 7, 2010 at 9:37 AM, Chris Nighswonger <[email protected]> wrote: > Also adding conditional to check ENV VAR definition to avoid unnecssary warns. > --- > opac/opac-main.pl | 18 ++++++++++-------- > 1 files changed, 10 insertions(+), 8 deletions(-) > > diff --git a/opac/opac-main.pl b/opac/opac-main.pl > index f218a00..ba0409c 100755 > --- a/opac/opac-main.pl > +++ b/opac/opac-main.pl > @@ -67,14 +67,16 @@ my $news_lang; > if($input->cookie('KohaOpacLanguage')){ > $news_lang = $input->cookie('KohaOpacLanguage'); > }else{ > - while( !$news_lang && ( $ENV{HTTP_ACCEPT_LANGUAGE} =~ > m/([a-zA-Z]{2,}-?[a-zA-Z]*)(;|,)?/g ) ){ > - if( my @lang = grep { /^$1$/i } @languages ) { > - $news_lang = $lang[0]; > + if ($ENV{HTTP_ACCEPT_LANGUAGE}) { > + while( !$news_lang && ( $ENV{HTTP_ACCEPT_LANGUAGE} =~ > m/([a-zA-Z]{2,}-?[a-zA-Z]*)(;|,)?/g ) ){ > + if( my @lang = grep { /^$1$/i } @languages ) { > + $news_lang = $lang[0]; > + } > + } > + if (not $news_lang) { > + my @languages = split ",", > C4::Context->preference("opaclanguages"); > + $news_lang = $languages[0]; > } > - } > - if (not $news_lang) { > - my @languages = split ",", C4::Context->preference("opaclanguages"); > - $news_lang = @languages[0]; > } > } > > @@ -88,7 +90,7 @@ $template->param( > koha_news_count => $koha_news_count > ); > > -# If GoogleIndicTransliteration system preference is On Set paramter to load > Google's javascript in OPAC search screens > +# If GoogleIndicTransliteration system preference is On Set paramter to load > Google's javascript in OPAC search screens > if (C4::Context->preference('GoogleIndicTransliteration')) { > $template->param('GoogleIndicTransliteration' => 1); > } > -- > 1.6.0.4 > > _______________________________________________ Koha-patches mailing list [email protected] http://lists.koha.org/mailman/listinfo/koha-patches
