[Koha-patches] [PATCH] Fix for Bug 3589, OpacHighlightedWords sys pref does nothing

[LAURENT Henri-Damien]

Owen Leonard wrote:
This patch does not apply. Can you check it out or rebase and resend ?
> ---
>  C4/Auth.pm                                         |    1 +
>  .../opac-tmpl/prog/en/modules/opac-results.tmpl    |   10 ++++------
>  2 files changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/C4/Auth.pm b/C4/Auth.pm
> index 608fd9b..f0b0ccf 100755
> --- a/C4/Auth.pm
> +++ b/C4/Auth.pm
> @@ -394,6 +394,7 @@ sub get_template_and_user {
>              LoginBranchname           => C4::Context->userenv?C4::Context->userenv->{"branchname"}:"",
>              OPACAmazonSimilarItems    => "" . C4::Context->preference("OPACAmazonSimilarItems"),
>              OPACFRBRizeEditions       => C4::Context->preference("OPACFRBRizeEditions"),
> +            OpacHighlightedWords       => C4::Context->preference("OpacHighlightedWords"),
>              OPACItemHolds             => C4::Context->preference("OPACItemHolds"),
>              OPACShelfBrowser          => "". C4::Context->preference("OPACShelfBrowser"),
>              OPACURLOpenInNewWindow    => "" . C4::Context->preference("OPACURLOpenInNewWindow"),
> diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
> index d3da357..646a642 100644
> --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
> +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
> @@ -10,8 +10,8 @@
>  
>  
>  <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
> -<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.highlight-3.js"></script>
> -<script type="text/javascript">
> +<!-- TMPL_IF NAME="OpacHighlightedWords" --><script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.highlight-3.js"></script>
> +<!-- /TMPL_IF --><script type="text/javascript">
>  //<![CDATA[
>  
>  function holdMultiple() {
> @@ -162,13 +162,11 @@ $(document).ready(function(){
>  <!-- /TMPL_IF -->
>      $("#holdDetails").hide();
>  
> -    <!-- TMPL_IF NAME="query_desc" -->
> -        var query_desc = "<!-- TMPL_VAR NAME="query_desc" ESCAPE="JS"-->";
> +<!-- TMPL_IF NAME="query_desc" --><!-- TMPL_IF NAME="OpacHighlightedWords" -->var query_desc = "<!-- TMPL_VAR NAME="query_desc" ESCAPE="JS"-->";
>          q_array = query_desc.split(" ");
>          highlightOn();
>          $("#highlight_toggle_on" ).hide().click(function() {highlightOn() ;});
> -        $("#highlight_toggle_off").show().click(function() {highlightOff();});
> -    <!-- /TMPL_IF -->
> +        $("#highlight_toggle_off").show().click(function() {highlightOff();});<!-- /TMPL_IF --><!-- /TMPL_IF -->
>  
>  	<!-- TMPL_IF NAME="TagsEnabled" -->
>          $(".tagbutton").click(KOHA.Tags.add_tag_button);
>