From f35b144668d48723ff806b7692b62ba93f57d142 Mon Sep 17 00:00:00 2001 From: Joe Atzberger Date: Thu, 4 Jun 2009 12:43:52 -0500 Subject: [PATCH] Pull the last OPAC-specific tmpl vars out of gettemplate. These don't belong every template, only on OPAC: ~ opacstylesheet ~ opaccolorstylesheet ~ opacsmallimage The latter 2 were already being populated in C4::Auth anyway. Signed-off-by: Galen Charlton --- C4/Auth.pm | 7 ++++--- C4/Output.pm | 9 +++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index f24f9af540..f26825d9aa 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -357,12 +357,13 @@ sub get_template_and_user { XSLTResultsDisplay => C4::Context->preference("XSLTResultsDisplay"), hidelostitems => C4::Context->preference("hidelostitems"), mylibraryfirst => (C4::Context->preference("SearchMyLibraryFirst")) ? C4::Context->userenv->{'branch'} : '', + opaclayoutstylesheet => "" . C4::Context->preference("opaclayoutstylesheet"), + opaccolorstylesheet => "" . C4::Context->preference("opaccolorstylesheet"), + opacstylesheet => "" . C4::Context->preference("opacstylesheet"), opacbookbag => "" . C4::Context->preference("opacbookbag"), - opaccolorstylesheet => "". C4::Context->preference("opaccolorstylesheet"), opaccredits => "" . C4::Context->preference("opaccredits"), opacheader => "" . C4::Context->preference("opacheader"), - opaclanguagesdisplay => "". C4::Context->preference("opaclanguagesdisplay"), - opaclayoutstylesheet => "". C4::Context->preference("opaclayoutstylesheet"), + opaclanguagesdisplay => "" . C4::Context->preference("opaclanguagesdisplay"), opacreadinghistory => C4::Context->preference("opacreadinghistory"), opacsmallimage => "" . C4::Context->preference("opacsmallimage"), opacuserjs => C4::Context->preference("opacuserjs"), diff --git a/C4/Output.pm b/C4/Output.pm index 6604ae07c0..a147bfdea3 100644 --- a/C4/Output.pm +++ b/C4/Output.pm @@ -100,13 +100,10 @@ sub gettemplate { . "/$theme/$lang"; $template->param( themelang => $themelang, - yuipath => (C4::Context->preference("yuipath") eq "local"?"$themelang/lib/yui":C4::Context->preference("yuipath")), + yuipath => (C4::Context->preference("yuipath") eq "local"?"$themelang/lib/yui":C4::Context->preference("yuipath")), interface => ( $interface ne 'intranet' ? '/opac-tmpl' : '/intranet-tmpl' ), - theme => $theme, - opacstylesheet => $opacstylesheet, - opaccolorstylesheet => C4::Context->preference('opaccolorstylesheet'), - opacsmallimage => C4::Context->preference('opacsmallimage'), - lang => $lang + theme => $theme, + lang => $lang ); # Bidirectionality -- 2.39.5